diff -Nru galera-3-25.3.19/debian/changelog galera-3-25.3.19/debian/changelog
--- galera-3-25.3.19/debian/changelog	2016-11-11 19:38:04.000000000 +0000
+++ galera-3-25.3.19/debian/changelog	2017-01-28 23:25:02.000000000 +0000
@@ -1,3 +1,10 @@
+galera-3 (25.3.19-2+rpi1) stretch-staging; urgency=medium
+
+  * Disable testsuite.
+  * Fix clean target.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 28 Jan 2017 23:25:02 +0000
+
 galera-3 (25.3.19-2) unstable; urgency=low
 
  * Backport upstream fix for OpenSSL SSL_R_SHORT_READ
diff -Nru galera-3-25.3.19/debian/rules galera-3-25.3.19/debian/rules
--- galera-3-25.3.19/debian/rules	2016-02-08 07:29:07.000000000 +0000
+++ galera-3-25.3.19/debian/rules	2017-01-28 23:25:02.000000000 +0000
@@ -20,9 +20,10 @@
 
 # Run tests by default
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	SCONS_ARGS += tests=1
+	#SCONS_ARGS += tests=1
 endif
 
+SCONS_ARGS += tests=0
 
 override_dh_auto_build:
 	# Print build env info to help debug builds on different platforms
@@ -44,6 +45,13 @@
 	dh_strip -pgalera-3 --dbg-package=galera-3-dbg
 	dh_strip -pgalera-arbitrator-3 --dbg-package=galera-arbitrator-3-dbg
 
+override_dh_auto_clean:
+	find . -name '*.o' -delete
+	find . -name '*.os' -delete
+	find . -name '*.a' -delete
+	rm -rf .sconf_temp FAIL .sconsign.dblite galera/tests/galera_check galerautils/tests/gu_tests *.log
+	dh_auto_clean
+
 %:
 	dh $@
 
diff -Nru galera-3-25.3.19/scripts/packages/debian/changelog galera-3-25.3.19/scripts/packages/debian/changelog
--- galera-3-25.3.19/scripts/packages/debian/changelog	2016-11-11 19:38:04.000000000 +0000
+++ galera-3-25.3.19/scripts/packages/debian/changelog	2017-01-28 23:25:02.000000000 +0000
@@ -1,3 +1,10 @@
+galera-3 (25.3.19-2+rpi1) stretch-staging; urgency=medium
+
+  * Disable testsuite.
+  * Fix clean target.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 28 Jan 2017 23:25:02 +0000
+
 galera-3 (25.3.19-2) unstable; urgency=low
 
  * Backport upstream fix for OpenSSL SSL_R_SHORT_READ
diff -Nru galera-3-25.3.19/scripts/packages/debian/rules galera-3-25.3.19/scripts/packages/debian/rules
--- galera-3-25.3.19/scripts/packages/debian/rules	2016-02-08 07:29:07.000000000 +0000
+++ galera-3-25.3.19/scripts/packages/debian/rules	2017-01-28 23:25:02.000000000 +0000
@@ -20,9 +20,10 @@
 
 # Run tests by default
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	SCONS_ARGS += tests=1
+	#SCONS_ARGS += tests=1
 endif
 
+SCONS_ARGS += tests=0
 
 override_dh_auto_build:
 	# Print build env info to help debug builds on different platforms
@@ -44,6 +45,13 @@
 	dh_strip -pgalera-3 --dbg-package=galera-3-dbg
 	dh_strip -pgalera-arbitrator-3 --dbg-package=galera-arbitrator-3-dbg
 
+override_dh_auto_clean:
+	find . -name '*.o' -delete
+	find . -name '*.os' -delete
+	find . -name '*.a' -delete
+	rm -rf .sconf_temp FAIL .sconsign.dblite galera/tests/galera_check galerautils/tests/gu_tests *.log
+	dh_auto_clean
+
 %:
 	dh $@