diff --git a/plans/all.fmf b/plans/all.fmf
deleted file mode 100644
index cdfc481..0000000
--- a/plans/all.fmf
+++ /dev/null
@@ -1,6 +0,0 @@
-summary: Test plan with all beakerlib tests
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/squid.git
-execute:
-    how: tmt
diff --git a/plans/imported.fmf b/plans/imported.fmf
new file mode 100644
index 0000000..1478b15
--- /dev/null
+++ b/plans/imported.fmf
@@ -0,0 +1,16 @@
+/public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/squid.git
+      name: "^/plans/all$"
+
+/internal:
+  adjust:
+    - enabled: false
+      when: distro == centos-stream-10
+      because: "These tests should not run on CentOS Stream 10"
+  plan:
+    import:
+      url: https://gitlab.com/redhat/rhel/tests/squid.git
+      name: "^/plans/squid/tier[1-3]$"
+    scope: all-plans
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
deleted file mode 100644
index 504e843..0000000
--- a/plans/tier1-internal.fmf
+++ /dev/null
@@ -1,10 +0,0 @@
-summary: Internal Tier1 beakerlib tests
-discover:
-    how: fmf
-    url: https://gitlab.com/redhat/rhel/tests/squid
-    filter: "tier:1&component:squid"
-execute:
-    how: tmt
-adjust:
-    enabled: false
-    when: distro == centos-stream-10
diff --git a/plans/tier1-public.fmf b/plans/tier1-public.fmf
deleted file mode 100644
index f33160f..0000000
--- a/plans/tier1-public.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: Public Tier1 beakerlib tests
-discover:
-    how: fmf
-    url: https://gitlab.com/redhat/centos-stream/tests/squid
-    filter: 'tier: 1'
-execute:
-    how: tmt