diff -u openldap-2.4.40+dfsg/debian/changelog openldap-2.4.40+dfsg/debian/changelog
--- openldap-2.4.40+dfsg/debian/changelog
+++ openldap-2.4.40+dfsg/debian/changelog
@@ -1,3 +1,10 @@
+openldap (2.4.40+dfsg-2+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from 2.4.40+dfsg-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 13 Jun 2015 14:20:35 +0000]
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Sun, 12 Jul 2015 21:01:21 +0000
+
 openldap (2.4.40+dfsg-2) unstable; urgency=medium
 
   * Actually install libldap-2.4-2.symbols.
diff -u openldap-2.4.40+dfsg/debian/rules openldap-2.4.40+dfsg/debian/rules
--- openldap-2.4.40+dfsg/debian/rules
+++ openldap-2.4.40+dfsg/debian/rules
@@ -198,0 +199,3 @@
+
+override_dh_auto_test:
+	echo testsuite disabled