diff -Nru glibc-2.25/debian/changelog glibc-2.25/debian/changelog
--- glibc-2.25/debian/changelog	2017-12-16 14:37:43.000000000 +0000
+++ glibc-2.25/debian/changelog	2017-12-27 21:11:39.000000000 +0000
@@ -1,3 +1,10 @@
+glibc (2.25-5+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 2.25-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 29 Nov 2017 03:00:21 +0000]
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 27 Dec 2017 21:11:39 +0000
+
 glibc (2.25-5) unstable; urgency=medium
 
   [ Samuel Thibault ]
diff -Nru glibc-2.25/debian/rules glibc-2.25/debian/rules
--- glibc-2.25/debian/rules	2017-12-16 13:48:10.000000000 +0000
+++ glibc-2.25/debian/rules	2017-12-27 21:11:39.000000000 +0000
@@ -97,7 +97,7 @@
 BASE_MIG = mig
 DEB_GCC_VERSION ?= -6
 
-RUN_TESTSUITE = yes
+RUN_TESTSUITE = no
 
 # Set cross and native compiler names, including version.
 CC     = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)$(DEB_GCC_VERSION) -no-pie -fno-PIE