diff -Nru geary-3.36.2/debian/changelog geary-3.36.2/debian/changelog
--- geary-3.36.2/debian/changelog	2020-05-04 18:39:26.000000000 +0000
+++ geary-3.36.2/debian/changelog	2020-09-10 11:18:55.000000000 +0000
@@ -1,3 +1,9 @@
+geary (3.36.2-1+rpi1) bullseye-staging; urgency=medium
+
+  * Disable testsuite.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 10 Sep 2020 11:18:55 +0000
+
 geary (3.36.2-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru geary-3.36.2/debian/control geary-3.36.2/debian/control
--- geary-3.36.2/debian/control	2020-05-04 18:39:26.000000000 +0000
+++ geary-3.36.2/debian/control	2020-09-10 11:18:55.000000000 +0000
@@ -6,7 +6,7 @@
 Section: mail
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Daniel Kahn Gillmor <dkg@fifthhorseman.net>, Jeremy Bicha <jbicha@debian.org>, Laurent Bigonville <bigon@debian.org>
+Uploaders: Jeremy Bicha <jbicha@debian.org>, Laurent Bigonville <bigon@debian.org>
 Build-Depends: debhelper-compat (= 13),
                appstream-util <!nocheck>,
                desktop-file-utils <!nocheck>,
diff -Nru geary-3.36.2/debian/rules geary-3.36.2/debian/rules
--- geary-3.36.2/debian/rules	2020-05-04 18:39:26.000000000 +0000
+++ geary-3.36.2/debian/rules	2020-09-10 11:18:46.000000000 +0000
@@ -21,7 +21,7 @@
 	dh_auto_configure -- $(BUILD_UNWIND) $(DISABLE_YTNEF) -Drevno=$(DEB_VENDOR)/$(DEB_VERSION)
 
 override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	localehelper LC_COLLATE=en_US.UTF-8 xvfb-run -a dh_auto_test
 endif