diff --git a/contrib/debian/control b/contrib/debian/control
index 1b1ad9ab4..ec22800d7 100644
--- a/contrib/debian/control
+++ b/contrib/debian/control
@@ -108,12 +108,14 @@ Description: Firmware update daemon
  See <https://github.com/hughsie/fwupd> for details
 
 Package: fwupd-tests
-Architecture: all
+Architecture: linux-any
 Depends: ${misc:Depends},
+         ${shlibs:Depends},
          ca-certificates,
          dbus-x11,
          fwupd,
          gnome-desktop-testing,
+         python3,
          python3-gi,
          python3-requests,
 Breaks: fwupd (<< 0.9.4-1)
diff --git a/contrib/debian/fwupd-tests.postrm b/contrib/debian/fwupd-tests.postrm
index 701c8cf21..758534c88 100644
--- a/contrib/debian/fwupd-tests.postrm
+++ b/contrib/debian/fwupd-tests.postrm
@@ -1,4 +1,7 @@
-#!/bin/sh
+#!/bin/sh -e
+
+#DEBHELPER#
+
 if [ "$1" = remove -o "$1" = purge ]; then
 	dpkg-divert --package fwupd-tests --remove --rename \
                 --divert /usr/share/dbus-1/system-services/org.freedesktop.fwupd.service.original \
diff --git a/contrib/debian/fwupd-tests.preinst b/contrib/debian/fwupd-tests.preinst
index f0ef47f1f..17ac200e9 100644
--- a/contrib/debian/fwupd-tests.preinst
+++ b/contrib/debian/fwupd-tests.preinst
@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/bin/sh -e
+
+#DEBHELPER#
 
 if [ "$1" = "upgrade" ] || [ "$1" = "install" ]; then
 	dpkg-divert --package fwupd-tests --add --rename \