diff -Nru notmuch-0.20.2/debian/changelog notmuch-0.20.2/debian/changelog
--- notmuch-0.20.2/debian/changelog	2015-06-27 13:05:31.000000000 +0000
+++ notmuch-0.20.2/debian/changelog	2015-09-18 21:52:41.000000000 +0000
@@ -1,3 +1,9 @@
+notmuch (0.20.2-1+rpi1) stretch-staging; urgency=medium
+
+  * Disable testsuite.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 18 Sep 2015 21:52:32 +0000
+
 notmuch (0.20.2-1) unstable; urgency=medium
 
   * Bug fix: "notmuch-tree does not mark messages as read", thanks to
diff -Nru notmuch-0.20.2/debian/rules notmuch-0.20.2/debian/rules
--- notmuch-0.20.2/debian/rules	2015-06-27 13:05:31.000000000 +0000
+++ notmuch-0.20.2/debian/rules	2015-09-18 21:52:27.000000000 +0000
@@ -35,5 +35,8 @@
 	cd bindings/python && $(python3_all) setup.py install --install-layout=deb --root=$(CURDIR)/debian/tmp
 	dh_auto_install --sourcedirectory bindings/ruby
 
+override_dh_auto_test:
+	echo testsuite disabled
+
 override_dh_strip:
 	dh_strip --dbg-package notmuch-dbg