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/cyrus-imapd.spec b/cyrus-imapd.spec
index 78c1fc4..f86be90 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -666,6 +666,7 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 %changelog
 * Wed Aug 17 2022 Martin Osvald <mosvald@redhat.com> - 3.4.1-7
 - Resolves: #2096149 - Fatal error when running "squatter -r user"
+- Resolves: #2096885 - Enhanced TMT testing for centos-stream
 
 * Wed Nov 24 2021 Martin Osvald <mosvald@redhat.com> - 3.4.1-6
 - Sending email with /usr/lib/cyrus-imapd/deliver fails with code 75
diff --git a/plans/public.fmf b/plans/public.fmf
new file mode 100644
index 0000000..b2b2cc8
--- /dev/null
+++ b/plans/public.fmf
@@ -0,0 +1,7 @@
+summary: Test plan that runs all tests from tests repo.
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/cyrus-imapd.git
+execute:
+    how: tmt
+
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
new file mode 100644
index 0000000..4466a24
--- /dev/null
+++ b/plans/tier1-internal.fmf
@@ -0,0 +1,15 @@
+summary: CI plan, picks Tier1 tests, runs in beakerlib.
+discover:
+  - name: rhel
+    how: fmf
+    filter: 'tier: 1'
+    url: git://pkgs.devel.redhat.com/tests/cyrus-imapd
+  - name: fedora
+    how: fmf
+    filter: 'tier: 1'
+    url: "https://src.fedoraproject.org/tests/cyrus-imapd.git"
+execute:
+    how: tmt
+adjust:
+    enabled: false
+    when: distro == centos-stream-9