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/fips-smoke.fmf b/plans/fips-smoke.fmf
new file mode 100644
index 0000000..4fda866
--- /dev/null
+++ b/plans/fips-smoke.fmf
@@ -0,0 +1,4 @@
+summary: Runs FIPS library integrity checks.
+name: fips-smoke
+execute:
+    script: if [[ $(GNUTLS_DEBUG_LEVEL=99 GNUTLS_FORCE_FIPS_MODE=1 certtool 2>&1 | grep "Error") ]]; then exit 1; else exit 0; fi;
diff --git a/plans/nss-2way.fmf b/plans/nss-2way.fmf
new file mode 100644
index 0000000..4c6cc65
--- /dev/null
+++ b/plans/nss-2way.fmf
@@ -0,0 +1,10 @@
+summary: Upstreamed gnutls-openssl 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-gnutls & tag: interop-nss & tag: interop-2way'
+execute:
+    how: tmt
diff --git a/plans/openssl-2way.fmf b/plans/openssl-2way.fmf
new file mode 100644
index 0000000..6187882
--- /dev/null
+++ b/plans/openssl-2way.fmf
@@ -0,0 +1,10 @@
+summary: Upstreamed gnutls-openssl interop-2way tests
+contact: Stanislav Zidek <szidek@redhat.com>
+discover:
+  # upstreamed tests (public)
+  - name: interop-openssl-2way
+    how: fmf
+    url: https://gitlab.com/redhat-crypto/tests/interop.git
+    filter: 'tag: interop-gnutls & tag: interop-openssl & tag: interop-2way'
+execute:
+    how: tmt
diff --git a/plans/short-interop-tests.fmf b/plans/short-interop-tests.fmf
new file mode 100644
index 0000000..4db38e8
--- /dev/null
+++ b/plans/short-interop-tests.fmf
@@ -0,0 +1,10 @@
+summary: Upstreamed gnutls interop tests - short tests which do not need to run in parallel
+contact: Stanislav Zidek <szidek@redhat.com>
+discover:
+  # upstreamed tests (public)
+  - name: interop-gnutls-short
+    how: fmf
+    url: https://gitlab.com/redhat-crypto/tests/interop.git
+    filter: 'tag: interop-gnutls & tag: -interop-slow'
+execute:
+    how: tmt
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index b32f8a2..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- hosts: localhost
-  roles:
-  - role: standard-test-basic
-    tags:
-    - classic
-    tests:
-    - smoke-fips:
-        dir: .
-        run: if [[ $(GNUTLS_DEBUG_LEVEL=99 GNUTLS_FORCE_FIPS_MODE=1 certtool 2>&1 | grep "Error") ]]; then exit 1; else exit 0; fi;
-    required_packages:
-    - gnutls
-    - gnutls-utils