diff --git a/plans/shell.fmf b/plans/shell.fmf
deleted file mode 100644
index 6f55e25..0000000
--- a/plans/shell.fmf
+++ /dev/null
@@ -1,14 +0,0 @@
-summary:
-    Run relevant tests from the shell tests repository
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/shell
-    filter: component:mksh
-prepare:
-    how: install
-    package: mksh
-execute:
-    how: tmt
-environment:
-    PACKAGES: mksh
-    SH_BIN: mksh
diff --git a/plans/tier1.fmf b/plans/tier1.fmf
new file mode 100644
index 0000000..89dfdf2
--- /dev/null
+++ b/plans/tier1.fmf
@@ -0,0 +1,27 @@
+---
+
+summary: Tier1 plan for mksh
+
+discover:
+  - how: fmf
+    filter: 'tag: CI-Tier-1 & component: mksh'
+    url: https://pkgs.devel.redhat.com/git/tests/bash
+  - how: fmf
+    filter: 'tag: CI-Tier-1 & component: mksh'
+    url: https://pkgs.devel.redhat.com/git/tests/dash
+  - how: fmf
+    filter: 'tag: CI-Tier-1 & component: mksh'
+    url: https://pkgs.devel.redhat.com/git/tests/ksh
+  - how: fmf
+    filter: 'tag: CI-Tier-1 & component: mksh'
+    url: https://pkgs.devel.redhat.com/git/tests/mksh
+  - how: fmf
+    filter: 'tag: CI-Tier-1 & component: mksh'
+    url: https://pkgs.devel.redhat.com/git/tests/zsh
+
+execute:
+  how: tmt
+
+adjust:
+    enabled: false
+    when: distro == centos-stream or distro == fedora