diff -Nru cups-2.3.0/debian/changelog cups-2.3.0/debian/changelog
--- cups-2.3.0/debian/changelog	2019-09-21 07:41:44.000000000 +0000
+++ cups-2.3.0/debian/changelog	2019-10-05 13:22:10.000000000 +0000
@@ -1,3 +1,10 @@
+cups (2.3.0-5+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 2.2.10-6+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 26 Jul 2019 16:23:41 +0000]
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Sat, 05 Oct 2019 13:22:10 +0000
+
 cups (2.3.0-5) unstable; urgency=medium
 
   * Let the test-drivers script stop waiting when a filter is allegedly
diff -Nru cups-2.3.0/debian/rules cups-2.3.0/debian/rules
--- cups-2.3.0/debian/rules	2019-09-21 07:41:44.000000000 +0000
+++ cups-2.3.0/debian/rules	2019-10-05 13:22:10.000000000 +0000
@@ -205,7 +205,7 @@
 	dh_strip_nondeterminism
 
 override_dh_auto_test:
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (testsuitedisabled,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	CUPS_TESTBASE=$(shell mktemp -d /tmp/cups.XXXXXX) make check
 	# Check that cups-config is not architecture-specific
 	[ -r cups-config ] && grep -vq $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) cups-config