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 f9433f0..fffe587 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,5 +19,3 @@ fprintd-0.1-04fd09cfa.tar.bz2
 /fprintd-v1.94.0.tar.gz
 /fprintd-v1.94.1.tar.gz
 /fprintd-v1.94.2.tar.gz
-/fprintd-v1.94.4.tar.gz
-/fprintd-v1.94.5.tar.gz
diff --git a/0001-Don-t-try-to-clear-storage-on-devices-without-intern.patch b/0001-Don-t-try-to-clear-storage-on-devices-without-intern.patch
new file mode 100644
index 0000000..4c1dd6e
--- /dev/null
+++ b/0001-Don-t-try-to-clear-storage-on-devices-without-intern.patch
@@ -0,0 +1,28 @@
+From 3633dbaa630d4734f3c63721eecbf935315cb80d Mon Sep 17 00:00:00 2001
+From: Julian <julian@aternos.org>
+Date: Sun, 1 May 2022 00:29:09 +0200
+Subject: [PATCH] Don't try to clear storage on devices without internal
+ storage This change prevents warnings like 'Failed to clear storage before
+ first enrollment: Device has no storage.'.
+
+---
+ src/device.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/device.c b/src/device.c
+index df1e782..b9de3ee 100644
+--- a/src/device.c
++++ b/src/device.c
+@@ -2209,7 +2209,8 @@ fprint_device_enroll_start (FprintDBusDevice      *dbus_dev,
+   priv->enroll_data = finger;
+   priv->current_action = ACTION_ENROLL;
+ 
+-  if (!fp_device_has_feature (priv->dev, FP_DEVICE_FEATURE_STORAGE_LIST) &&
++  if (fp_device_has_feature (priv->dev, FP_DEVICE_FEATURE_STORAGE) &&
++      !fp_device_has_feature (priv->dev, FP_DEVICE_FEATURE_STORAGE_LIST) &&
+       is_first_enrollment (rdev))
+     {
+       g_autoptr(GError) clear_err = NULL;
+-- 
+2.38.1
+
diff --git a/fprintd.spec b/fprintd.spec
index 183fadb..5ea5f92 100644
--- a/fprintd.spec
+++ b/fprintd.spec
@@ -1,12 +1,12 @@
 Name:		fprintd
-Version:	1.94.5
+Version:	1.94.2
 Release:	%autorelease
 Summary:	D-Bus service for Fingerprint reader access
 
-# man page is GFDL-1.1-or-later
-License:	GPL-2.0-or-later AND GFDL-1.1-or-later
+License:	GPLv2+
 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
@@ -18,11 +18,12 @@ BuildRequires:	polkit-devel
 BuildRequires:	gtk-doc
 BuildRequires:	gettext
 BuildRequires:	perl-podlators
-BuildRequires:	pkgconfig(libsystemd)
-BuildRequires:	pkgconfig(systemd)
+BuildRequires:	systemd
+BuildRequires:	systemd-devel
 BuildRequires:	python3-dbusmock
 BuildRequires:	python3-libpamtest
 
+Patch0: 0001-Don-t-try-to-clear-storage-on-devices-without-intern.patch
 
 %description
 D-Bus service to access fingerprint readers.
@@ -36,7 +37,7 @@ Provides:	pam_fprint = %{version}-%{release}
 Obsoletes:	pam_fprint < 0.2-3
 Requires(postun): authselect >= 0.3
 
-License:	GPL-2.0-or-later
+License:	GPLv2+
 
 %description pam
 PAM module that uses the fprintd D-Bus service for fingerprint
@@ -45,9 +46,7 @@ authentication.
 %package devel
 Summary:	Development files for %{name}
 Requires:	%{name} = %{version}-%{release}
-# dbus interfaces are GPL-2.0-or-later
-# documentation is GFDL-1.1-or-later
-License:	GPL-2.0-or-later AND GFDL-1.1-or-later
+License:	GFDL
 BuildArch:	noarch
 
 %description devel
@@ -82,7 +81,7 @@ fi
 %{_datadir}/dbus-1/system-services/net.reactivated.Fprint.service
 %{_unitdir}/fprintd.service
 %{_datadir}/polkit-1/actions/net.reactivated.fprint.device.policy
-%attr(0700, -, -) %{_localstatedir}/lib/fprint
+%{_localstatedir}/lib/fprint
 %{_mandir}/man1/fprintd.1.gz
 
 %files pam
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/sources b/sources
index 61cac3d..cf4d6aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fprintd-v1.94.5.tar.gz) = ee71d1d8cfea99fb6711bd4039011702a1f31c59a23d13423fca8be17b43b29bf7a7434e0baf598f2d4bfefd42c08f2f7e3c6ebdf371d53aa9d6b7963d4732dc
+SHA512 (fprintd-v1.94.2.tar.gz) = 2fd9e03446b923b29a2a915d395dc85afe10589ea5d78f047e0d3ae2a96255178589d6072c1e10ed8ac607515e410b343aef62ea551baf272999bd012c33f8e0
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