diff -u gcc-6-6.4.0/debian/changelog gcc-6-6.4.0/debian/changelog
--- gcc-6-6.4.0/debian/changelog
+++ gcc-6-6.4.0/debian/changelog
@@ -1,3 +1,10 @@
+gcc-6 (6.4.0-17+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 6.4.0-11+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 10 Feb 2018 15:48:42 +0000]
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Tue, 05 Jun 2018 02:26:08 +0000
+
 gcc-6 (6.4.0-17) unstable; urgency=medium
 
   * Update to SVN 20180424 (r259590) from the gcc-6-branch.
diff -u gcc-6-6.4.0/debian/rules.defs gcc-6-6.4.0/debian/rules.defs
--- gcc-6-6.4.0/debian/rules.defs
+++ gcc-6-6.4.0/debian/rules.defs
@@ -1552,7 +1552,7 @@
 # run testsuite ---------------
 with_check := yes
 # if you don't want to run the gcc testsuite, uncomment the next line
-#with_check := disabled by hand
+with_check := disabled by plugwash
 ifeq ($(with_base_only),yes)
   with_check := no
 endif