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,9 @@
+openldap (2.4.40+dfsg-1+rpi1) stretch-staging; urgency=medium
+
+  * Disable testsuite.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 13 Jun 2015 14:20:35 +0000
+
 openldap (2.4.40+dfsg-1) unstable; urgency=medium
 
   * Remove inetorgperson.schema from the upstream source. Replace it with a
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
@@ -197,0 +198,3 @@
+
+override_dh_auto_test:
+	echo testsuite disabled