diff --git a/.fmf/version b/.fmf/version
deleted file mode 100644
index d00491f..0000000
--- a/.fmf/version
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/fprintd.spec b/fprintd.spec
index 183fadb..b76ab7c 100644
--- a/fprintd.spec
+++ b/fprintd.spec
@@ -7,6 +7,7 @@ Summary:	D-Bus service for Fingerprint reader access
 License:	GPL-2.0-or-later AND GFDL-1.1-or-later
 Source0:	https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v%{version}/fprintd-v%{version}.tar.gz
 Url:		http://www.freedesktop.org/wiki/Software/fprint/fprintd
+ExcludeArch:    s390 s390x
 
 BuildRequires:	meson
 BuildRequires:	gcc
diff --git a/plans.fmf b/plans.fmf
deleted file mode 100644
index c195230..0000000
--- a/plans.fmf
+++ /dev/null
@@ -1,19 +0,0 @@
-summary: Run all tests
-discover:
-  how: fmf
-  dist-git-source: true
-  dist-git-merge: true
-prepare:
-  - name: Disable installing everything from srpm
-    how: install
-    exclude: ".*"
-  - name: Install the main package
-    how: install
-    package:
-      - fprintd
-  - name: "%prep requires git"
-    how: install
-    package:
-      - git
-execute:
-  how: tmt
diff --git a/tests/main.fmf b/tests/main.fmf
deleted file mode 100644
index ebe3556..0000000
--- a/tests/main.fmf
+++ /dev/null
@@ -1,10 +0,0 @@
-/fprintd:
-  summary: Run fprintd.py
-  test: ./run.sh ./fprintd.py
-  require:
-    - python3-gobject-base
-    - python3-dbus
-    - python3-cairo
-    - dbus-daemon
-    - python3-dbusmock
-  duration: 10m
diff --git a/tests/run.sh b/tests/run.sh
index 9a6f061..ffd03db 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -10,7 +10,7 @@ if [[ "$ID" = *"rhel"* ]] && [[ "$VERSION_ID" == *"8"* ]]; then
 fi
 
 # Switch into the tests directory
-cd ../fprintd-*/tests || exit 1
+cd source/tests || exit 1
 
 # Run actual test
-exec python3 "$@"
+exec python3 "$@"
\ No newline at end of file
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..1a2a318
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,24 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-source
+    tags:
+    - always
+    required_packages:
+    - git
+  - role: standard-test-basic
+    tags:
+    - atomic
+    - classic
+    required_packages:
+    - fprintd
+    - python3-gobject-base
+    - python3-dbus
+    - python3-cairo
+    - dbus-daemon
+    - python3-dbusmock
+    tests:
+    - fprintd:
+        dir: .
+        run: run.sh ./fprintd.py
+        timeout: 10m