diff --git a/tests/.fmf/version b/.fmf/version
similarity index 100%
rename from tests/.fmf/version
rename to .fmf/version
diff --git a/plans/build-iso.fmf b/plans/build-iso.fmf
new file mode 100644
index 0000000..ae03eff
--- /dev/null
+++ b/plans/build-iso.fmf
@@ -0,0 +1,7 @@
+summary: Run Lorax tests (build an iso, run mkksiso on it)
+prepare:
+    how: install
+    package:
+    - lorax
+execute:
+    script: ./tests/scripts/run_tests.sh
diff --git a/tests/provision.fmf b/tests/provision.fmf
deleted file mode 100644
index dd69f34..0000000
--- a/tests/provision.fmf
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-standard-inventory-qcow2:
-  qemu:
-    m: 4G
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index d39d256..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-# Run lorax with the new templates
-- hosts: localhost
-  roles:
-    - role: standard-test-basic
-      tags:
-        - classic
-
-      required_packages:
-        - lorax
-
-      tests:
-        - simple:
-            dir: scripts
-            run: ./run_tests.sh