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/libfprint.spec b/libfprint.spec
index e4479c7..07a5807 100644
--- a/libfprint.spec
+++ b/libfprint.spec
@@ -8,6 +8,7 @@ Summary:        Toolkit for fingerprint scanner
 License:        LicenseRef-Callaway-LGPLv2+
 URL:            http://www.freedesktop.org/wiki/Software/fprint/libfprint
 Source0:        https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v%{version}/libfprint-v%{version}.tar.gz
+ExcludeArch:    s390 s390x
 
 BuildRequires:  meson
 BuildRequires:  gcc
@@ -60,8 +61,8 @@ the functionality of the installed %{name} package.
 
 %ldconfig_scriptlets
 
-# TODO: The test can't run with the recent pygobject3.52.
-# So, skip the test until the issue of pygobject is fixed.
+%check
+%meson_test -t 4
 
 %files
 %license COPYING
diff --git a/plans/integration.fmf b/plans/integration.fmf
deleted file mode 100644
index 05fe63a..0000000
--- a/plans/integration.fmf
+++ /dev/null
@@ -1,5 +0,0 @@
-summary: Test for libfprint
-discover:
-    how: fmf
-execute:
-    how: tmt
diff --git a/tests/integration/main.fmf b/tests/integration/main.fmf
deleted file mode 100644
index df893f0..0000000
--- a/tests/integration/main.fmf
+++ /dev/null
@@ -1,11 +0,0 @@
-summary: Test for libfprint
-require:
-    - cairo-devel
-    - libfprint-devel
-    - libfprint-tests
-    - umockdev-devel
-    - python3-cairo 
-    - python3-gobject-base
-    - python3-pip
-    - python3-packaging
-test: bash ./run-umockdev.sh
diff --git a/tests/integration/run-umockdev.sh b/tests/run-umockdev.sh
similarity index 79%
rename from tests/integration/run-umockdev.sh
rename to tests/run-umockdev.sh
index 1beeca1..d8c5362 100755
--- a/tests/integration/run-umockdev.sh
+++ b/tests/run-umockdev.sh
@@ -2,7 +2,7 @@
 set -u
 
 # Switch into the tests directory
-cd /usr/share/installed-tests/libfprint-2 || exit 1
+cd source/tests || exit 1
 
 # check if we need to install additional packages
 # which is the case if we are on RHEL 8
@@ -14,7 +14,7 @@ if [[ "$ID" = *"rhel"* ]] && [[ "$VERSION_ID" == *"8"* ]]; then
     pip3 install python-dbusmock
 fi
 
-# Each directory in /usr/share/installed-tests/libfprint-2 is a umockdev based test
+# Each directory in source/tests is a umockdev based test
 # discover them
 declare -a TESTS=()
 for f in *; do
@@ -27,7 +27,7 @@ export FP_DEVICE_EMULATION=1
 RESULT=0
 for test in ${TESTS[@]}; do
     echo "$test"
-    /usr/libexec/installed-tests/libfprint-2/umockdev-test.py "$test"
+    ./umockdev-test.py "$test"
     RES=$?
     echo "$test finished with return code $RES"
     echo ""
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..ab999c2
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,23 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-source
+    tags:
+    - always
+    required_packages:
+    - git
+  - role: standard-test-basic
+    tags:
+    - atomic
+    - classic
+    required_packages:
+    - python3-dbusmock
+    - umockdev
+    tests:
+    - virtual_image:
+        dir: .
+        run: source/tests/virtual-image.py
+    - umockdev:
+        dir: .
+        run: run-umockdev.sh
+