diff -Nru ruby2.5-2.5.0/debian/changelog ruby2.5-2.5.0/debian/changelog
--- ruby2.5-2.5.0/debian/changelog	2018-03-04 16:30:49.000000000 +0000
+++ ruby2.5-2.5.0/debian/changelog	2018-03-14 03:41:41.000000000 +0000
@@ -1,3 +1,10 @@
+ruby2.5 (2.5.0-6+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 2.5.0-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 20 Feb 2018 21:18:57 +0000]
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 14 Mar 2018 03:41:41 +0000
+
 ruby2.5 (2.5.0-6) unstable; urgency=medium
 
   * debian/rules: explicitly pass --runstatedir, --localstatedir, and
diff -Nru ruby2.5-2.5.0/debian/rules ruby2.5-2.5.0/debian/rules
--- ruby2.5-2.5.0/debian/rules	2018-03-04 16:30:49.000000000 +0000
+++ ruby2.5-2.5.0/debian/rules	2018-03-14 03:41:40.000000000 +0000
@@ -65,7 +65,7 @@
 excludes += --excludes-dir=debian/tests/excludes/$(DEB_HOST_ARCH)/
 override_dh_auto_test-arch:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	$(MAKE) check V=1 RUBY_TESTOPTS=-v TESTS="$(excludes)"
+	#$(MAKE) check V=1 RUBY_TESTOPTS=-v TESTS="$(excludes)"
 endif
 
 override_dh_auto_install-arch: