diff --git a/plans/basic.fmf b/plans/basic.fmf
new file mode 100644
index 0000000..d5e588d
--- /dev/null
+++ b/plans/basic.fmf
@@ -0,0 +1,8 @@
+summary:
+    Basic functionality
+discover:
+    how: fmf
+provision:
+    how: local
+execute:
+    how: tmt
diff --git a/plans/basic/basic.fmf b/plans/basic/basic.fmf
deleted file mode 100644
index 3dde0b4..0000000
--- a/plans/basic/basic.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: Basic command line features
-description:
-    Wide set of tests that cover individual steps, commands
-    and features. These tests do not require virtualization,
-    their individual duration should not exceed 5 minutes.
-discover:
-    how: fmf
diff --git a/plans/main.fmf b/plans/main.fmf
deleted file mode 100644
index f18dda9..0000000
--- a/plans/main.fmf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Run on localhost by default
-provision:
-    how: local
-
-# Use the internal executor
-execute:
-    how: tmt
-
-# Disable cruncher until it is replaced
-artifact:
-    - disable-cruncher
diff --git a/tests/main.fmf b/tests/main.fmf
new file mode 100644
index 0000000..56d4244
--- /dev/null
+++ b/tests/main.fmf
@@ -0,0 +1 @@
+require: [cheat]