diff --git a/plans/all.fmf b/plans/all.fmf
new file mode 100644
index 0000000..0bac812
--- /dev/null
+++ b/plans/all.fmf
@@ -0,0 +1,6 @@
+summary: Run all tests
+discover:
+    how: fmf
+execute:
+    how: tmt
+
diff --git a/plans/ci.fmf b/plans/ci.fmf
deleted file mode 100644
index 8ad6b03..0000000
--- a/plans/ci.fmf
+++ /dev/null
@@ -1,6 +0,0 @@
-summary: CI plan, picks up all tests, runs in beakerlib.
-discover:
-  - name: fedora
-    how: fmf 
-execute:
-    how: tmt
diff --git a/plans/others.fmf b/plans/others.fmf
new file mode 100644
index 0000000..13ef9e7
--- /dev/null
+++ b/plans/others.fmf
@@ -0,0 +1,21 @@
+/public:
+  summary: Public other tests
+  discover:
+    how: fmf
+    filter: 'tier: -1 & tier: -2 & tier: -3 & tag: -multihost'
+    url: "https://src.fedoraproject.org/tests/python-cups.git"
+  execute:
+    how: tmt
+
+/internal:
+  summary: Internal other tests
+  discover:
+    how: fmf
+    filter: 'tier: -1 & tier: -2 & tier: -3 & tag: -multihost'
+    url: git://pkgs.devel.redhat.com/tests/python-cups
+  adjust:
+    enabled: false
+    when: distro == centos-stream or distro == fedora
+  execute:
+    how: tmt
+
diff --git a/plans/tier1.fmf b/plans/tier1.fmf
new file mode 100644
index 0000000..58cd892
--- /dev/null
+++ b/plans/tier1.fmf
@@ -0,0 +1,21 @@
+/public:
+  summary: Public Tier1 tests
+  discover:
+    how: fmf
+    filter: 'tier: 1'
+    url: "https://src.fedoraproject.org/tests/python-cups.git"
+  execute:
+    how: tmt
+
+/internal:
+  summary: Internal Tier1 tests
+  discover:
+    how: fmf
+    filter: 'tier: 1'
+    url: git://pkgs.devel.redhat.com/tests/python-cups
+  adjust:
+    enabled: false
+    when: distro == centos-stream or distro == fedora
+  execute:
+    how: tmt
+
diff --git a/plans/tier2-tier3.fmf b/plans/tier2-tier3.fmf
new file mode 100644
index 0000000..07f6218
--- /dev/null
+++ b/plans/tier2-tier3.fmf
@@ -0,0 +1,21 @@
+/public:
+  summary: Public Tier2 and Tier3 tests
+  discover:
+    how: fmf
+    filter: 'tier: 2 | tier: 3'
+    url: "https://src.fedoraproject.org/tests/python-cups.git"
+  execute:
+    how: tmt
+
+/internal:
+  summary: Internal Tier2 and Tier3 tests
+  discover:
+    how: fmf
+    filter: 'tier: 2 | tier: 3'
+    url: git://pkgs.devel.redhat.com/tests/python-cups
+  adjust:
+    enabled: false
+    when: distro == centos-stream or distro == fedora
+  execute:
+    how: tmt
+