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/.gitignore b/.gitignore
index de738fb..1584e03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@ upower-0.9.5.tar.bz2
 /upower-v1.90.6.tar.bz2
 /upower-v1.90.8.tar.bz2
 /upower-v1.90.9.tar.bz2
+/upower-v1.90.10.tar.bz2
diff --git a/plans/integration.fmf b/plans/integration.fmf
new file mode 100644
index 0000000..aa2d392
--- /dev/null
+++ b/plans/integration.fmf
@@ -0,0 +1,19 @@
+summary: Test for Upower
+discover:
+    how: fmf
+prepare:
+  - name: packages
+    how: install
+    package:
+        - upower
+        - upower-tests
+        - umockdev-devel
+        - dbus-x11
+        - polkit-devel
+        - python3-dbus
+        - python3-dbusmock
+        - python3-gobject-base
+        - python3-pip
+        - python3-packaging
+execute:
+    how: tmt
diff --git a/sources b/sources
index d2899f5..725b805 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (upower-v1.90.9.tar.bz2) = 7308e03125a5a888242253f9260f68283f5b53677c08dbc4d7e4d48cc6f600f50f8ab161d100f152138208d5119acddc90f0f19742aa8cca58e3a0ec54975110
+SHA512 (upower-v1.90.10.tar.bz2) = f7bfb4c4301b6155a17c6b1baf12947503037bb8f8827ab7993ade39ef1aaece64bc08318c73600f62cd5b2ff7d372cc58652045efa803fff5951abd466a3d63
diff --git a/tests/integration/main.fmf b/tests/integration/main.fmf
new file mode 100644
index 0000000..a06a61c
--- /dev/null
+++ b/tests/integration/main.fmf
@@ -0,0 +1,3 @@
+summary: Upower integration test
+duration: 10m
+test: bash ./run-it.sh
diff --git a/tests/run-it.sh b/tests/integration/run-it.sh
similarity index 87%
rename from tests/run-it.sh
rename to tests/integration/run-it.sh
index 5db3a05..8b086bf 100755
--- a/tests/run-it.sh
+++ b/tests/integration/run-it.sh
@@ -2,7 +2,7 @@
 set -u
 
 # main script
-IT="${1:-source/src/linux/integration-test}"
+IT="${1:-/usr/libexec/installed-tests/upower/integration-test.py}"
 
 # check if we need to install additional packages
 # which is the case if we are on RHEL 8
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index d569ef8..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- hosts: localhost
-  roles:
-  - role: standard-test-source
-    tags:
-    - always
-    required_packages:
-    - git-core
-  - role: standard-test-basic
-    tags:
-    - atomic
-    - classic
-    required_packages:
-    - upower
-    - pygobject3-devel
-    - python3-dbus
-    - python3-dbusmock
-    - python3-packaging
-    - umockdev-devel
-    tests:
-    - smoke:
-        dir: smoke
-        run: upower -d
-    - integration:
-        dir: .
-        run: ./run-it.sh source/src/linux/integration-test.py
diff --git a/upower.spec b/upower.spec
index 6e3e242..a0b0ecd 100644
--- a/upower.spec
+++ b/upower.spec
@@ -1,6 +1,6 @@
 Summary:        Power Management Service
 Name:           upower
-Version:        1.90.9
+Version:        1.90.10
 Release:        %autorelease
 License:        GPL-2.0-or-later
 URL:            http://upower.freedesktop.org/
@@ -56,6 +56,13 @@ BuildArch: noarch
 %description devel-docs
 Developer documentation for for libupower-glib.
 
+%package tests
+Summary: Test files for Upower
+Requires: %{name}%{?_isa} = %{version}-%{release}
+ 
+%description tests
+Test files for Upower
+
 %prep
 %autosetup -n %{name}-v%{version} -p1 -S git
 
@@ -71,6 +78,9 @@ Developer documentation for for libupower-glib.
 %install
 %meson_install
 
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/installed-tests
+mv $RPM_BUILD_ROOT%{_libexecdir}/upower $RPM_BUILD_ROOT%{_libexecdir}/installed-tests
+
 %find_lang upower
 
 %ldconfig_scriptlets
@@ -94,7 +104,7 @@ Developer documentation for for libupower-glib.
 %ghost %dir %{_localstatedir}/lib/upower
 %dir %{_sysconfdir}/UPower
 %config %{_sysconfdir}/UPower/UPower.conf
-%{_bindir}/*
+%{_bindir}/upower
 %{_libexecdir}/*
 %{_mandir}/man1/*
 %{_mandir}/man7/*
@@ -124,5 +134,11 @@ Developer documentation for for libupower-glib.
 %dir %{_datadir}/gtk-doc/html/UPower
 %{_datadir}/gtk-doc/html/UPower/*
 
+%files tests
+%{_libexecdir}/installed-tests/upower
+%dir %{_datadir}/installed-tests/
+%dir %{_datadir}/installed-tests/upower/
+%{_datadir}/installed-tests/upower/upower-integration.test
+
 %changelog
 %autochangelog