diff -Nru emacs25-25.2+1/debian/changelog emacs25-25.2+1/debian/changelog
--- emacs25-25.2+1/debian/changelog	2017-09-12 02:51:49.000000000 +0000
+++ emacs25-25.2+1/debian/changelog	2017-10-03 21:11:23.000000000 +0000
@@ -1,3 +1,10 @@
+emacs25 (25.2+1-6+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 25.2+1-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 17 Aug 2017 18:29:59 +0000]
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Tue, 03 Oct 2017 21:11:23 +0000
+
 emacs25 (25.2+1-6) unstable; urgency=high
 
   * Block remote code execution via enriched text.  Add
diff -Nru emacs25-25.2+1/debian/rules emacs25-25.2+1/debian/rules
--- emacs25-25.2+1/debian/rules	2017-09-12 02:47:25.000000000 +0000
+++ emacs25-25.2+1/debian/rules	2017-10-03 21:11:22.000000000 +0000
@@ -371,7 +371,7 @@
 	$(call build_cmd,debian/build-lucid)
 
 override_dh_auto_test:
-  ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+  ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	$(MAKE) -C debian/build-lucid check
 	$(MAKE) -C debian/build-nox check
 	$(MAKE) -C debian/build-x check