diff -Nru blacs-mpi-1.1/debian/changelog blacs-mpi-1.1/debian/changelog
--- blacs-mpi-1.1/debian/changelog	2017-06-11 05:20:40.000000000 +0000
+++ blacs-mpi-1.1/debian/changelog	2018-05-03 14:58:43.000000000 +0000
@@ -1,3 +1,9 @@
+blacs-mpi (1.1-40+rpi1) buster-staging; urgency=medium
+
+  * Disable testsuite.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 03 May 2018 14:58:43 +0000
+
 blacs-mpi (1.1-40) unstable; urgency=medium
 
   * Team upload.
diff -Nru blacs-mpi-1.1/debian/rules blacs-mpi-1.1/debian/rules
--- blacs-mpi-1.1/debian/rules	2017-06-11 05:20:40.000000000 +0000
+++ blacs-mpi-1.1/debian/rules	2018-05-03 14:58:43.000000000 +0000
@@ -206,7 +206,7 @@
 ifneq ($(filter $(NO_TESTING_ARCH),$(NO_TESTING)),)
 	touch check-stamp-openmpi
 else
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	 dh_testdir
 	if [ -x /usr/bin/mpiexec.openmpi ]; then \
     	  (cd TESTING/EXE; for i in *-openmpi; do \
@@ -223,7 +223,7 @@
 endif
 
 check-stamp-lam:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	dh_testdir
 	if [ -x /usr/bin/mpiexec.lam ]; then \
 	  (cd TESTING/EXE; for i in *-lam; do \
@@ -239,7 +239,7 @@
 	touch check-stamp-lam
 
 check-stamp-mpich:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	dh_testdir
 	if [ -x /usr/bin/mpiexec.mpich ]; then \
 	  (cd TESTING/EXE; for i in *-mpich; do \
@@ -255,7 +255,7 @@
 	touch check-stamp-mpich
 
 check-stamp-mpich2:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	dh_testdir
 	if [ -x /usr/bin/mpiexec.mpich2 ]; then \
 	  (cd TESTING/EXE; for i in *-mpich2; do \