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/.gitignore b/.gitignore
index fca0e92..5e6ada9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,13 +38,3 @@ upower-0.9.5.tar.bz2
 /upower-v0.99.14.tar.bz2
 /upower-v0.99.19.tar.bz2
 /upower-v0.99.20.tar.bz2
-/upower-v1.90.1.tar.bz2
-/upower-v1.90.2.tar.bz2
-/upower-v1.90.4.tar.bz2
-/upower-v1.90.5.tar.bz2
-/upower-v1.90.6.tar.bz2
-/upower-v1.90.7.tar.bz2
-/upower-v1.90.8.tar.bz2
-/upower-v1.90.9.tar.bz2
-/upower-v1.90.10.tar.bz2
-/upower-v1.91.0.tar.bz2
diff --git a/plans/integration.fmf b/plans/integration.fmf
deleted file mode 100644
index aa2d392..0000000
--- a/plans/integration.fmf
+++ /dev/null
@@ -1,19 +0,0 @@
-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 c586f4b..8cf5295 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (upower-v1.91.0.tar.bz2) = 32801d3ee4c5086221a9f12062b0f2e6765b239f68a562c24ef7808999bb34e299e6acd31acf5c414cf41613709c97b20ad64d252e1d8ddf23183576b156cf93
+SHA512 (upower-v0.99.20.tar.bz2) = 50e5b03f1319da3869b0caba4fbe78c8eabf1df6f783f1463b06394bee58bae42ad411780faa503965c5fdb983d723c0b5ae0731fae4220997a17875f4850b1e
diff --git a/tests/integration/main.fmf b/tests/integration/main.fmf
deleted file mode 100644
index 683aaf3..0000000
--- a/tests/integration/main.fmf
+++ /dev/null
@@ -1,2 +0,0 @@
-summary: Upower integration test
-test: bash ./run-it.sh
diff --git a/tests/integration/run-it.sh b/tests/run-it.sh
similarity index 87%
rename from tests/integration/run-it.sh
rename to tests/run-it.sh
index 8b086bf..5db3a05 100755
--- a/tests/integration/run-it.sh
+++ b/tests/run-it.sh
@@ -2,7 +2,7 @@
 set -u
 
 # main script
-IT="${1:-/usr/libexec/installed-tests/upower/integration-test.py}"
+IT="${1:-source/src/linux/integration-test}"
 
 # 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
new file mode 100644
index 0000000..cdee703
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,26 @@
+---
+- 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
diff --git a/upower.spec b/upower.spec
index 87a9f4c..6e72b0c 100644
--- a/upower.spec
+++ b/upower.spec
@@ -1,9 +1,9 @@
 Summary:        Power Management Service
 Name:           upower
-Version:        1.91.0
+Version:        0.99.20
 Release:        %autorelease
-License:        GPL-2.0-or-later
-URL:            https://upower.freedesktop.org/
+License:        GPLv2+
+URL:            http://upower.freedesktop.org/
 Source0:        https://gitlab.freedesktop.org/upower/%{name}/-/archive/v%{version}/%{name}-v%{version}.tar.bz2
 
 BuildRequires:  meson
@@ -20,47 +20,31 @@ BuildRequires:  libimobiledevice-devel
 BuildRequires:  glib2-devel >= 2.6.0
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  gtk-doc
-BuildRequires:  polkit-devel
 BuildRequires:  systemd
 
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:       udev
+Requires:       gobject-introspection
+
 
 %description
 UPower (formerly DeviceKit-power) provides a daemon, API and command
 line tools for managing power devices attached to the system.
 
-%package libs
-Summary: Client libraries for UPower
-Requires: gobject-introspection
-Recommends: %{name}%{?_isa} = %{version}-%{release}
-Conflicts: %{name} < 0.99.20-4
-
-%description libs
-Client libraries for UPower.
-
 %package devel
 Summary: Headers and libraries for UPower
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 Headers and libraries for UPower.
 
 %package devel-docs
 Summary: Developer documentation for for libupower-glib
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 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
 
@@ -76,9 +60,6 @@ Test files for Upower
 %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
@@ -95,28 +76,22 @@ mv $RPM_BUILD_ROOT%{_libexecdir}/upower $RPM_BUILD_ROOT%{_libexecdir}/installed-
 %files -f upower.lang
 %{!?_licensedir:%global license %%doc}
 %license COPYING
-%doc NEWS AUTHORS HACKING.md README.md
+%doc NEWS AUTHORS HACKING README
+%{_libdir}/libupower-glib.so.*
 %{_datadir}/dbus-1/system.d/*.conf
 %{_udevrulesdir}/*.rules
 %{_udevhwdbdir}/*.hwdb
 %ghost %dir %{_localstatedir}/lib/upower
 %dir %{_sysconfdir}/UPower
 %config %{_sysconfdir}/UPower/UPower.conf
-%{_sysconfdir}/UPower/UPower.conf.d/README.md
-%{_bindir}/upower
-%{_libexecdir}/upowerd
+%{_bindir}/*
+%{_libexecdir}/*
+%{_libdir}/girepository-1.0/*.typelib
 %{_mandir}/man1/*
 %{_mandir}/man7/*
 %{_mandir}/man8/*
 %{_datadir}/dbus-1/system-services/*.service
 %{_unitdir}/*.service
-%{_datadir}/polkit-1/actions/org.freedesktop.upower.policy
-%{_datadir}/zsh/*
-
-%files libs
-%license COPYING
-%{_libdir}/libupower-glib.so.3{,.*}
-%{_libdir}/girepository-1.0/*.typelib
 
 %files devel
 %{_datadir}/dbus-1/interfaces/*.xml
@@ -132,11 +107,5 @@ mv $RPM_BUILD_ROOT%{_libexecdir}/upower $RPM_BUILD_ROOT%{_libexecdir}/installed-
 %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