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/nmap.spec b/nmap.spec
index 3d7b01a..beb37d9 100644
--- a/nmap.spec
+++ b/nmap.spec
@@ -7,7 +7,7 @@ Name: nmap
 Epoch: 3
 Version: 7.91
 #global prerelease TEST5
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Network exploration tool and security scanner
 URL: http://nmap.org/
 # Uses combination of licenses based on GPL license, but with extra modification
@@ -160,6 +160,9 @@ fi
 %{_mandir}/man1/ncat.1.gz
 
 %changelog
+* Tue Jan 10 2023 Martin Osvald <mosvald@redhat.com> - 3:7.91-12
+- Enhanced TMT testing for centos-stream (#2159206)
+
 * Fri Nov 25 2022 Martin Osvald <mosvald@redhat.com> - 3:7.91-11
 - ncat does not work with --proxy (#2140101)
 
diff --git a/plans/public.fmf b/plans/public.fmf
new file mode 100644
index 0000000..52d7bf5
--- /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/nmap.git
+execute:
+    how: tmt
+
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
new file mode 100644
index 0000000..4511244
--- /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/nmap
+  - name: fedora
+    how: fmf
+    filter: 'tier: 1'
+    url: "https://src.fedoraproject.org/tests/nmap.git"
+execute:
+    how: tmt
+adjust:
+    enabled: false
+    when: distro == centos-stream-9