diff -Nru glibc-2.24/debian/changelog glibc-2.24/debian/changelog
--- glibc-2.24/debian/changelog	2016-12-04 21:49:53.000000000 +0000
+++ glibc-2.24/debian/changelog	2016-12-21 16:00:29.000000000 +0000
@@ -1,3 +1,10 @@
+glibc (2.24-8+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from 2.24-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 26 Oct 2016 00:35:58 +0000]
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 21 Dec 2016 16:00:29 +0000
+
 glibc (2.24-8) unstable; urgency=medium
 
   [ Samuel Thibault ]
diff -Nru glibc-2.24/debian/rules.d/build.mk glibc-2.24/debian/rules.d/build.mk
--- glibc-2.24/debian/rules.d/build.mk	2016-12-04 21:49:53.000000000 +0000
+++ glibc-2.24/debian/rules.d/build.mk	2016-12-21 16:00:29.000000000 +0000
@@ -113,7 +113,9 @@
 $(patsubst %,check_%,$(GLIBC_PASSES)) :: check_% : $(stamp)check_%
 $(stamp)check_%: $(stamp)build_%
 	@set -e ; \
-	if [ -n "$(filter nocheck,$(DEB_BUILD_OPTIONS))" ]; then \
+	if true; then \
+	    echo testsuite disabled ; \
+	elif [ -n "$(filter nocheck,$(DEB_BUILD_OPTIONS))" ]; then \
 	  echo "Tests have been disabled via DEB_BUILD_OPTIONS." ; \
 	elif [ $(call xx,configure_build) != $(call xx,configure_target) ] && \
 	     ! $(DEB_BUILDDIR)/elf/ld.so $(DEB_BUILDDIR)/libc.so >/dev/null 2>&1 ; then \