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/libfprint.spec b/libfprint.spec
index 07a5807..e4479c7 100644
--- a/libfprint.spec
+++ b/libfprint.spec
@@ -8,7 +8,6 @@ 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
@@ -61,8 +60,8 @@ the functionality of the installed %{name} package.
 
 %ldconfig_scriptlets
 
-%check
-%meson_test -t 4
+# TODO: The test can't run with the recent pygobject3.52.
+# So, skip the test until the issue of pygobject is fixed.
 
 %files
 %license COPYING
diff --git a/plans/integration.fmf b/plans/integration.fmf
new file mode 100644
index 0000000..05fe63a
--- /dev/null
+++ b/plans/integration.fmf
@@ -0,0 +1,5 @@
+summary: Test for libfprint
+discover:
+    how: fmf
+execute:
+    how: tmt
diff --git a/tests/integration/main.fmf b/tests/integration/main.fmf
new file mode 100644
index 0000000..df893f0
--- /dev/null
+++ b/tests/integration/main.fmf
@@ -0,0 +1,11 @@
+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/run-umockdev.sh b/tests/integration/run-umockdev.sh
similarity index 79%
rename from tests/run-umockdev.sh
rename to tests/integration/run-umockdev.sh
index d8c5362..1beeca1 100755
--- a/tests/run-umockdev.sh
+++ b/tests/integration/run-umockdev.sh
@@ -2,7 +2,7 @@
 set -u
 
 # Switch into the tests directory
-cd source/tests || exit 1
+cd /usr/share/installed-tests/libfprint-2 || 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 source/tests is a umockdev based test
+# Each directory in /usr/share/installed-tests/libfprint-2 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"
-    ./umockdev-test.py "$test"
+    /usr/libexec/installed-tests/libfprint-2/umockdev-test.py "$test"
     RES=$?
     echo "$test finished with return code $RES"
     echo ""
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index ab999c2..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- 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
-