diff -Nru glibc-2.28/debian/changelog glibc-2.28/debian/changelog
--- glibc-2.28/debian/changelog	2019-02-09 17:34:27.000000000 +0000
+++ glibc-2.28/debian/changelog	2019-02-22 01:39:52.000000000 +0000
@@ -1,3 +1,10 @@
+glibc (2.28-7+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>  Fri, 22 Feb 2019 01:39:52 +0000
+
 glibc (2.28-7) unstable; urgency=medium
 
   * debian/patches/hurd-i386/local-no-bootstrap-fs-access.diff: Refresh.
diff -Nru glibc-2.28/debian/rules glibc-2.28/debian/rules
--- glibc-2.28/debian/rules	2019-02-05 21:07:35.000000000 +0000
+++ glibc-2.28/debian/rules	2019-02-22 01:39:52.000000000 +0000
@@ -98,7 +98,7 @@
 BASE_MIG = mig
 DEB_GCC_VERSION ?= -8
 
-RUN_TESTSUITE = yes
+RUN_TESTSUITE = no
 TIMEOUTFACTOR = 25
 
 # Set cross and native compiler names, including version.