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/unit.fmf b/plans/unit.fmf
new file mode 100644
index 0000000..02d5b23
--- /dev/null
+++ b/plans/unit.fmf
@@ -0,0 +1,17 @@
+summary: stratis-cli unit tests
+
+prepare:
+  - name: Install package
+    how: install
+    package: [stratis-cli, util-linux, python3-psutil]
+
+discover:
+  how: shell
+  url: https://github.com/stratis-storage/testing.git
+  ref: v3.5.2
+  tests:
+    - name: unit
+      test: python3 stratis_cli_cert.py -v
+
+execute:
+  how: tmt
diff --git a/stratis-cli.spec b/stratis-cli.spec
index f3b9496..107cdd6 100644
--- a/stratis-cli.spec
+++ b/stratis-cli.spec
@@ -1,6 +1,6 @@
 Name:           stratis-cli
 Version:        3.5.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Command-line tool for interacting with the Stratis daemon
 
 License:        Apache-2.0
@@ -62,6 +62,9 @@ a2x -f manpage docs/stratis.txt
 %{python3_sitelib}/stratis_cli-*.egg-info/
 
 %changelog
+* Wed Jun 14 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.3-2
+- Use tmt tests
+
 * Wed Jun 07 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.3-1
 - Update to 3.5.3
 
diff --git a/tests/provision.fmf b/tests/provision.fmf
deleted file mode 100644
index 1a4f0f0..0000000
--- a/tests/provision.fmf
+++ /dev/null
@@ -1,4 +0,0 @@
----
-standard-inventory-qcow2:
-  qemu:
-    m: 3G  # Amount of VM memory
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index dd3e8c7..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- hosts: localhost
-  roles:
-  - role: standard-test-basic
-    tags:
-      - classic
-    tests:
-      - simple:
-          dir: ./testing/
-          run: >
-            python3 stratis_cli_cert.py -v
-    required_packages:
-      - util-linux
-      - python3-psutil
-    repositories:
-      - repo: "https://github.com/stratis-storage/testing.git"
-        dest: "testing"
-        version: "v3.5.2"