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/plans/shell.fmf b/plans/shell.fmf
new file mode 100644
index 0000000..75700e0
--- /dev/null
+++ b/plans/shell.fmf
@@ -0,0 +1,11 @@
+summary:
+    Run relevant tests from the shell tests repository
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/shell
+    filter: component:bash
+execute:
+    how: tmt
+environment:
+    PACKAGES: bash
+    SH_BIN: bash
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 2eaaa7a..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-
-# Tests that run in classic context
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    repositories:
-    - repo: "https://src.fedoraproject.org/tests/shell.git"
-      dest: "shell"
-      fmf_filter: "tier: 1, 2 & tags: classic"
-    required_packages:
-    - expect            # login requires expect
-    - which             # smoke requires which
-
-# Tests that run in container and atomic contexts
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - container
-    - atomic
-    repositories:
-    - repo: "https://src.fedoraproject.org/tests/shell.git"
-      dest: "shell"
-      fmf_filter: "tier: 1, 2 & tags: container, atomic"
-    required_packages:
-    - which             # smoke requires which