diff -Nru scikit-learn-0.18/debian/changelog scikit-learn-0.18/debian/changelog
--- scikit-learn-0.18/debian/changelog	2016-12-28 12:24:45.000000000 +0000
+++ scikit-learn-0.18/debian/changelog	2017-06-27 22:16:46.000000000 +0000
@@ -1,3 +1,10 @@
+scikit-learn (0.18-5+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from 0.18-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 22 Nov 2016 15:34:29 +0000]
+  * Disable testsuite
+
+ -- Raspbian forward porter <root@raspbian.org>  Tue, 27 Jun 2017 22:16:46 +0000
+
 scikit-learn (0.18-5) unstable; urgency=medium
 
   * Team upload.
diff -Nru scikit-learn-0.18/debian/rules scikit-learn-0.18/debian/rules
--- scikit-learn-0.18/debian/rules	2016-12-28 12:24:45.000000000 +0000
+++ scikit-learn-0.18/debian/rules	2017-06-27 22:16:46.000000000 +0000
@@ -84,7 +84,7 @@
 	python$* setup.py install --install-layout=deb  --root=$(CURDIR)/debian/tmp
 
 python-test%: python-install%
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (xxxxxxxxxxxx,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	: # Run unittests here against installed scikits.learn
 	echo "$*" | grep -q '^3' && PY=3 || PY=$*; \
 	export PYTHONPATH=`/bin/ls -d $$PWD/debian/tmp/usr/lib/python$$PY/*/`; \