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/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