diff -Nru mercurial-5.6.1/debian/changelog mercurial-5.6.1/debian/changelog
--- mercurial-5.6.1/debian/changelog	2021-01-08 16:16:53.000000000 +0000
+++ mercurial-5.6.1/debian/changelog	2021-01-23 13:59:56.000000000 +0000
@@ -1,3 +1,10 @@
+mercurial (5.6.1-1+rpi1) bullseye-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>  Sat, 23 Jan 2021 13:59:56 +0000
+
 mercurial (5.6.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru mercurial-5.6.1/debian/rules mercurial-5.6.1/debian/rules
--- mercurial-5.6.1/debian/rules	2020-10-14 11:47:31.000000000 +0000
+++ mercurial-5.6.1/debian/rules	2021-01-23 13:59:56.000000000 +0000
@@ -35,7 +35,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