diff -Nru vim-7.4.826/debian/changelog vim-7.4.826/debian/changelog
--- vim-7.4.826/debian/changelog	2015-08-17 02:17:52.000000000 +0000
+++ vim-7.4.826/debian/changelog	2015-09-11 08:43:10.000000000 +0000
@@ -1,3 +1,9 @@
+vim (2:7.4.826-1+rpi1) stretch-staging; urgency=medium
+
+  * Disable testsuite.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 11 Sep 2015 08:42:58 +0000
+
 vim (2:7.4.826-1) unstable; urgency=medium
 
   * Merge upstream tag v7-4-826. Remove merged patches.
diff -Nru vim-7.4.826/debian/rules vim-7.4.826/debian/rules
--- vim-7.4.826/debian/rules	2015-06-13 04:55:01.000000000 +0000
+++ vim-7.4.826/debian/rules	2015-09-11 08:42:50.000000000 +0000
@@ -27,11 +27,11 @@
 BUILDER := $(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2> /dev/null))}})
 
 MAKETEST := no
-ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-  ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-    MAKETEST := yes
-  endif
-endif
+#ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+#  ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+#    MAKETEST := yes
+#  endif
+#endif
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
     NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))