diff -Nru mariadb-10.6-10.6.8/debian/changelog mariadb-10.6-10.6.8/debian/changelog
--- mariadb-10.6-10.6.8/debian/changelog	2022-05-22 23:44:02.000000000 +0000
+++ mariadb-10.6-10.6.8/debian/changelog	2022-06-16 18:28:57.000000000 +0000
@@ -1,3 +1,10 @@
+mariadb-10.6 (1:10.6.8-1+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 1:10.6.7-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 17 Mar 2022 23:44:37 +0000]
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 16 Jun 2022 18:28:57 +0000
+
 mariadb-10.6 (1:10.6.8-1) unstable; urgency=medium
 
   * New upstream version 10.6.8. Includes security fixes for
diff -Nru mariadb-10.6-10.6.8/debian/rules mariadb-10.6-10.6.8/debian/rules
--- mariadb-10.6-10.6.8/debian/rules	2022-05-22 23:44:02.000000000 +0000
+++ mariadb-10.6-10.6.8/debian/rules	2022-06-16 18:28:57.000000000 +0000
@@ -127,7 +127,7 @@
 	# Skip unstable tests if such are defined for arch
 	[ ! -f debian/unstable-tests.$(DEB_HOST_ARCH) ] || cat debian/unstable-tests.$(DEB_HOST_ARCH) >> mysql-test/unstable-tests
 	# Run testsuite
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	# Don't use --mem here as official Debian builders and most Docker systems don't have a large mem device available and
 	# would fail with errors on lack of disk space.
 	cd $(BUILDDIR)/mysql-test && \