diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 0000000..c5aa0e0
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1 @@
+resultsdb-testcase: separate
diff --git a/plans/gnutls-2way.fmf b/plans/gnutls-2way.fmf
new file mode 100644
index 0000000..15a7595
--- /dev/null
+++ b/plans/gnutls-2way.fmf
@@ -0,0 +1,10 @@
+summary: Upstreamed interop-2way tests
+contact: Stanislav Zidek <szidek@redhat.com>
+discover:
+  # upstreamed tests (public)
+  - name: interop-gnutls-2way
+    how: fmf
+    url: https://gitlab.com/redhat-crypto/tests/interop.git
+    filter: 'tag: interop-openssl & tag: interop-gnutls & tag: interop-2way'
+execute:
+    how: tmt
diff --git a/plans/nss-2way.fmf b/plans/nss-2way.fmf
new file mode 100644
index 0000000..05a8e33
--- /dev/null
+++ b/plans/nss-2way.fmf
@@ -0,0 +1,10 @@
+summary: Upstreamed interop-2way tests
+contact: Stanislav Zidek <szidek@redhat.com>
+discover:
+  # upstreamed tests (public)
+  - name: interop-nss-2way
+    how: fmf
+    url: https://gitlab.com/redhat-crypto/tests/interop.git
+    filter: 'tag: interop-openssl & tag: interop-nss & tag: interop-2way'
+execute:
+    how: tmt
diff --git a/plans/nss-reneg.fmf b/plans/nss-reneg.fmf
new file mode 100644
index 0000000..4648f4c
--- /dev/null
+++ b/plans/nss-reneg.fmf
@@ -0,0 +1,10 @@
+summary: Upstreamed interop-2way tests
+contact: Stanislav Zidek <szidek@redhat.com>
+discover:
+  # upstreamed tests (public)
+  - name: interop-nss-reneg
+    how: fmf
+    url: https://gitlab.com/redhat-crypto/tests/interop.git
+    filter: 'tag: interop-openssl & tag: interop-nss & tag: interop-reneg'
+execute:
+    how: tmt
diff --git a/plans/python.fmf b/plans/python.fmf
new file mode 100644
index 0000000..e5a51b8
--- /dev/null
+++ b/plans/python.fmf
@@ -0,0 +1,11 @@
+summary: Python self-test.	
+contact: python maintainers <python-maint@redhat.com>	
+discover:	
+  - name: python-selftest
+    how: fmf
+    url: https://src.fedoraproject.org/tests/python.git
+    filter: 'test: ./parallel.sh'
+environment:
+    X: "test_ssl test_asyncio test_hashlib test_ftplib test_httplib test_imaplib test_logging test_nntplib test_poplib test_urllib2_localnet test_urllib test_xmlrpc"
+execute:
+    how: tmt
diff --git a/plans/short-interop-tests.fmf b/plans/short-interop-tests.fmf
new file mode 100644
index 0000000..7b610b2
--- /dev/null
+++ b/plans/short-interop-tests.fmf
@@ -0,0 +1,10 @@
+summary: Upstreamed interop tests - short tests which do not need to run in parallel
+contact: Stanislav Zidek <szidek@redhat.com>
+discover:
+  # upstreamed tests (public)
+  - name: interop-other+basic
+    how: fmf
+    url: https://gitlab.com/redhat-crypto/tests/interop.git
+    filter: 'tag: interop-openssl & tag: -interop-slow'
+execute:
+    how: tmt
diff --git a/tests/tests_python.yml b/tests/tests_python.yml
deleted file mode 100644
index 5341446..0000000
--- a/tests/tests_python.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- hosts: localhost
-  roles:
-  - role: standard-test-basic
-    tags:
-    - classic
-    repositories:
-    - repo: "https://src.fedoraproject.org/tests/python.git"
-      dest: "python"
-    tests:
-    - python_selftest:
-        dir: python/selftest
-        run: X="test_ssl test_asyncio test_hashlib test_ftplib test_httplib test_imaplib test_logging test_nntplib test_poplib test_urllib2_localnet test_urllib test_xmlrpc" ./parallel.sh
-    required_packages:
-    - gcc  # for extension building in venv and selftest
-    - python3-tkinter  # for selftest
-    - python3-test  # for selftest
-    - python3-rpm-macros  # for dynamic python version