diff -Nru openldap-2.4.42+dfsg/debian/changelog openldap-2.4.42+dfsg/debian/changelog
--- openldap-2.4.42+dfsg/debian/changelog	2015-09-11 03:13:19.000000000 +0000
+++ openldap-2.4.42+dfsg/debian/changelog	2015-09-19 02:38:35.000000000 +0000
@@ -1,3 +1,10 @@
+openldap (2.4.42+dfsg-2+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from 2.4.42+dfsg-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 31 Aug 2015 16:17:47 +0000]
+  * Disable testsuite.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 18 Sep 2015 14:36:27 +0000
+
 openldap (2.4.42+dfsg-2) unstable; urgency=medium
 
   [ Ryan Tandy ]
diff -Nru openldap-2.4.42+dfsg/debian/rules openldap-2.4.42+dfsg/debian/rules
--- openldap-2.4.42+dfsg/debian/rules	2015-09-08 17:11:03.000000000 +0000
+++ openldap-2.4.42+dfsg/debian/rules	2015-09-19 02:39:56.000000000 +0000
@@ -229,3 +229,6 @@
 		contrib/slapd-modules/passwd/sha2/pw-sha2.la \
 		contrib/slapd-modules/passwd/sha2/pw-sha2.o
 endif
+
+override_dh_auto_test:
+	echo testsuite disabled.