diff -Nru openldap-2.4.54+dfsg/debian/changelog openldap-2.4.54+dfsg/debian/changelog
--- openldap-2.4.54+dfsg/debian/changelog	2020-10-18 16:03:46.000000000 +0000
+++ openldap-2.4.54+dfsg/debian/changelog	2020-10-26 12:13:39.000000000 +0000
@@ -1,3 +1,10 @@
+openldap (2.4.54+dfsg-1+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 2.4.53+dfsg-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 14 Sep 2020 14:19:10 +0000]
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Mon, 26 Oct 2020 12:13:39 +0000
+
 openldap (2.4.54+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru openldap-2.4.54+dfsg/debian/rules openldap-2.4.54+dfsg/debian/rules
--- openldap-2.4.54+dfsg/debian/rules	2020-10-18 16:03:46.000000000 +0000
+++ openldap-2.4.54+dfsg/debian/rules	2020-10-26 12:13:39.000000000 +0000
@@ -131,7 +131,7 @@
 	# Disable test060-mt-host on ppc64el until #866122 is fixed.
 	rm -f tests/scripts/test060-mt-hot
 endif
-	dh_auto_test
+	#dh_auto_test
 
 override_dh_auto_install:
 	dh_auto_install -- $(MAKEVARS)