diff -Nru emacs-25.2+1/debian/changelog emacs-25.2+1/debian/changelog
--- emacs-25.2+1/debian/changelog	2018-08-26 16:49:09.000000000 +0000
+++ emacs-25.2+1/debian/changelog	2018-09-14 11:26:52.000000000 +0000
@@ -1,3 +1,10 @@
+emacs (1:25.2+1-11+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from emacs25 25.2+1-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 17 Aug 2017 18:29:59 +0000]
+  * Disable testsuite.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 14 Sep 2018 11:26:52 +0000
+
 emacs (1:25.2+1-11) unstable; urgency=medium
 
   * Add (>= 1:25) restriction to emacs metapackage dependencies.
diff -Nru emacs-25.2+1/debian/rules emacs-25.2+1/debian/rules
--- emacs-25.2+1/debian/rules	2018-08-26 16:44:45.000000000 +0000
+++ emacs-25.2+1/debian/rules	2018-09-14 11:26:52.000000000 +0000
@@ -345,7 +345,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-gtk check