diff -Nru emacs-26.1+1/debian/changelog emacs-26.1+1/debian/changelog
--- emacs-26.1+1/debian/changelog	2018-12-26 19:54:16.000000000 +0000
+++ emacs-26.1+1/debian/changelog	2019-01-01 23:05:43.000000000 +0000
@@ -1,3 +1,10 @@
+emacs (1:26.1+1-3+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.
+
+ -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Jan 2019 23:05:43 +0000
+
 emacs (1:26.1+1-3) unstable; urgency=medium
 
   * Recommend mailutils instead of depending on it.
diff -Nru emacs-26.1+1/debian/rules emacs-26.1+1/debian/rules
--- emacs-26.1+1/debian/rules	2018-12-20 16:43:30.000000000 +0000
+++ emacs-26.1+1/debian/rules	2019-01-01 23:05:43.000000000 +0000
@@ -336,7 +336,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