diff -Nru flatpak-1.8.4/debian/changelog flatpak-1.8.4/debian/changelog
--- flatpak-1.8.4/debian/changelog	2020-12-24 10:58:59.000000000 +0000
+++ flatpak-1.8.4/debian/changelog	2020-12-29 21:22:09.000000000 +0000
@@ -1,3 +1,10 @@
+flatpak (1.8.4-1+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 1.8.3-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 14 Dec 2020 21:41:29 +0000]
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Tue, 29 Dec 2020 21:22:09 +0000
+
 flatpak (1.8.4-1) unstable; urgency=medium
 
   * debian/o.fd.Flatpak.pkla: sync with rules provided by upstream
diff -Nru flatpak-1.8.4/debian/.gitignore flatpak-1.8.4/debian/.gitignore
--- flatpak-1.8.4/debian/.gitignore	2020-12-24 10:58:59.000000000 +0000
+++ flatpak-1.8.4/debian/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-/*.debhelper
-/*.substvars
-/flatpak-tests/
-/flatpak/
-/gir1.2-flatpak-1.0/
-/libflatpak-dev/
-/libflatpak-doc/
-/libflatpak0/
diff -Nru flatpak-1.8.4/debian/rules flatpak-1.8.4/debian/rules
--- flatpak-1.8.4/debian/rules	2020-12-24 10:58:59.000000000 +0000
+++ flatpak-1.8.4/debian/rules	2020-12-29 21:22:09.000000000 +0000
@@ -69,7 +69,7 @@
 	dh_installsystemd --no-start
 
 override_dh_auto_test-arch:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	debian/test.sh
 endif