diff --git a/plans/all.fmf b/plans/python-based.fmf
similarity index 92%
rename from plans/all.fmf
rename to plans/python-based.fmf
index 607d0442b0..3ad7b0f9c9 100644
--- a/plans/all.fmf
+++ b/plans/python-based.fmf
@@ -1,4 +1,4 @@
-summary: top level management
+summary: whole install Python-based tests
 prepare:
   - name: Install packages
     how: install
diff --git a/plans/testing_3.5.2.fmf b/plans/testing_3.5.2.fmf
new file mode 100644
index 0000000000..8854d09d93
--- /dev/null
+++ b/plans/testing_3.5.2.fmf
@@ -0,0 +1,35 @@
+summary: Run testing scripts from HEAD revision
+prepare:
+  - name: Install packages
+    how: install
+    package:
+     - python3-dbus-python-client-gen
+     - python3-gobject
+     - python3-psutil
+     - systemd
+     - tang
+     - util-linux
+  - name: Start tang server
+    how: shell
+    script: systemctl enable tangd.socket --now
+  - name: Reload udev
+    how: shell
+    script: udevadm control --reload
+  - name: Show test system information
+    how: shell
+    script: free -m; lsblk -i; lscpu; cat /proc/1/sched
+  - name: Record mkfs.xfs version
+    how: shell
+    script: mkfs.xfs -V
+discover:
+  url: https://github.com/stratis-storage/testing.git
+  ref: v3.5.2
+  tests:
+    - name: unit
+      test: >
+        RUST_LOG=stratisd=debug
+        python3 test_harness.py --log-level=debug stratisd_cert
+        --verify-devices
+execute:
+  how: tmt
+  exit-first: false
diff --git a/plans/testing_HEAD.fmf b/plans/testing_HEAD.fmf
new file mode 100644
index 0000000000..5ac5a35227
--- /dev/null
+++ b/plans/testing_HEAD.fmf
@@ -0,0 +1,35 @@
+summary: Run testing scripts from HEAD revision
+prepare:
+  - name: Install packages
+    how: install
+    package:
+     - python3-dbus-python-client-gen
+     - python3-gobject
+     - python3-psutil
+     - systemd
+     - tang
+     - util-linux
+  - name: Start tang server
+    how: shell
+    script: systemctl enable tangd.socket --now
+  - name: Reload udev
+    how: shell
+    script: udevadm control --reload
+  - name: Show test system information
+    how: shell
+    script: free -m; lsblk -i; lscpu; cat /proc/1/sched
+  - name: Record mkfs.xfs version
+    how: shell
+    script: mkfs.xfs -V
+discover:
+  url: https://github.com/stratis-storage/testing.git
+  ref: HEAD
+  tests:
+    - name: unit
+      test: >
+        RUST_LOG=stratisd=debug
+        python3 test_harness.py --log-level=debug stratisd_cert
+        --verify-devices --monitor-dbus --highest-revision-number=6
+execute:
+  how: tmt
+  exit-first: false