diff -Nru mercurial-5.9/debian/changelog mercurial-5.9/debian/changelog
--- mercurial-5.9/debian/changelog	2021-08-25 17:54:04.000000000 +0000
+++ mercurial-5.9/debian/changelog	2021-09-29 09:22:01.000000000 +0000
@@ -1,3 +1,10 @@
+mercurial (5.9-3+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 5.5.2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 13 Dec 2020 10:30:51 +0000]
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 29 Sep 2021 09:22:01 +0000
+
 mercurial (5.9-3) unstable; urgency=medium
 
   * Further adjust tests for endianness-related variations.
diff -Nru mercurial-5.9/debian/rules mercurial-5.9/debian/rules
--- mercurial-5.9/debian/rules	2021-08-23 13:54:10.000000000 +0000
+++ mercurial-5.9/debian/rules	2021-09-29 09:22:01.000000000 +0000
@@ -31,7 +31,7 @@
 ARCH_IS_SPARC := $(if $(subst sparc,,$(DEB_HOST_ARCH)),,T)
 
 override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 # test-pull-pull-corruption tries to execute two hg commands at the
 # same time to test for corruption.  It does so by running an hg
 # command in the background, sleeping one second and running the