diff --git a/srcpkgs/fwupd-tests b/srcpkgs/fwupd-tests
new file mode 120000
index 00000000000..0c0ff5cd22d
--- /dev/null
+++ b/srcpkgs/fwupd-tests
@@ -0,0 +1 @@
+fwupd
\ No newline at end of file
diff --git a/srcpkgs/fwupd/patches/skip-fu-self-tests.patch b/srcpkgs/fwupd/patches/skip-fu-self-tests.patch
new file mode 100644
index 00000000000..f6adbea3fd6
--- /dev/null
+++ b/srcpkgs/fwupd/patches/skip-fu-self-tests.patch
@@ -0,0 +1,9 @@
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -383,5 +383,5 @@ if get_option('tests')
+       '-DSRCDIR="' + meson.current_source_dir() + '"',
+     ],
+   )
+-  test('fu-self-test', e, is_parallel: false, timeout: 180, env: env)
++  # test('fu-self-test', e, is_parallel: false, timeout: 180, env: env)
+ endif
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index ef3ebfd8809..e9a453d4efc 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,7 +1,7 @@
 # Template file for 'fwupd'
 pkgname=fwupd
 version=1.9.10
-revision=1
+revision=2
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dsupported_build=enabled -Dconsolekit=disabled
@@ -59,6 +59,14 @@ post_install() {
 	vcompletion data/bash-completion/fwupdtool bash fwupdtool
 }
 
+fwupd-tests_package() {
+	short_desc+=" - self-tests"
+	pkg_install() {
+		vmove usr/libexec/installed-tests
+		vmove usr/share/installed-tests
+	}
+}
+
 fwupd-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} libglib-devel libcurl-devel
 	 libjcat-devel libgusb-devel libxmlb-devel libarchive-devel gcab-devel