diff -Nru pbbam-0.23.0+dfsg/debian/changelog pbbam-0.23.0+dfsg/debian/changelog
--- pbbam-0.23.0+dfsg/debian/changelog	2019-08-04 19:16:32.000000000 +0000
+++ pbbam-0.23.0+dfsg/debian/changelog	2019-08-19 00:24:19.000000000 +0000
@@ -1,3 +1,10 @@
+pbbam (0.23.0+dfsg-1+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 0.7.4+ds-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 30 Jul 2017 13:11:07 +0000]
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Mon, 19 Aug 2019 00:24:19 +0000
+
 pbbam (0.23.0+dfsg-1) unstable; urgency=medium
 
   * Afif removed himself from Uploaders
diff -Nru pbbam-0.23.0+dfsg/debian/rules pbbam-0.23.0+dfsg/debian/rules
--- pbbam-0.23.0+dfsg/debian/rules	2019-08-04 19:16:32.000000000 +0000
+++ pbbam-0.23.0+dfsg/debian/rules	2019-08-19 00:24:19.000000000 +0000
@@ -13,7 +13,7 @@
 	  dh $@ --buildsystem=meson
 
 override_dh_auto_test: $(subst .t.in,.deb.t,$(wildcard tests/src/cram/pb*.t.in))
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	dh_auto_configure -O--buildsystem=meson
 	mkdir -p $(generated_data_dir)
 	python3 tests/scripts/generate_data.py $(CURDIR)/tests/data $(generated_data_dir)