diff -Nru galera-3-25.3.20/debian/changelog galera-3-25.3.20/debian/changelog
--- galera-3-25.3.20/debian/changelog	2017-03-09 16:41:42.000000000 +0000
+++ galera-3-25.3.20/debian/changelog	2017-08-01 21:43:08.000000000 +0000
@@ -1,3 +1,10 @@
+galera-3 (25.3.20-1+rpi1) buster-staging; urgency=medium
+
+  * Disable testsuite.
+  * Fix clean target
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 01 Aug 2017 21:43:08 +0000
+
 galera-3 (25.3.20-1) unstable; urgency=low
 
   * Update Vcs-* URLs to use secure connections
diff -Nru galera-3-25.3.20/debian/rules galera-3-25.3.20/debian/rules
--- galera-3-25.3.20/debian/rules	2017-01-30 18:55:30.000000000 +0000
+++ galera-3-25.3.20/debian/rules	2017-08-01 21:43:08.000000000 +0000
@@ -19,10 +19,10 @@
 endif
 
 # Run tests by default
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	SCONS_ARGS += tests=1 deterministic_tests=1
-endif
-
+#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+#	SCONS_ARGS += tests=1 deterministic_tests=1
+#endif
+SCONS_ARGS += tests=0 deterministic_tests=0
 
 override_dh_auto_build:
 	# Print build env info to help debug builds on different platforms
@@ -47,4 +47,17 @@
 %:
 	dh $@
 
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f `find . -name *.o`
+	rm -f `find . -name *.a`
+	rm -f `find . -name *.os`
+	rm -rf .sconf_temp
+	rm -f FAIL  .sconsign.dblite
+	rm -f galera/tests/galera_check
+	rm -f galerautils/tests/gu_tests
+	rm -f galerautils/tests/gu_tests++
+	rm -f config.log galera/tests/galera_check.passed galera_check.log galerautils/tests/gu_tests.passed gu_tests++.log gu_tests.log
+
+
 .PHONY: override_dh_strip
diff -Nru galera-3-25.3.20/scripts/packages/debian/changelog galera-3-25.3.20/scripts/packages/debian/changelog
--- galera-3-25.3.20/scripts/packages/debian/changelog	2017-03-09 16:41:42.000000000 +0000
+++ galera-3-25.3.20/scripts/packages/debian/changelog	2017-08-01 21:43:08.000000000 +0000
@@ -1,3 +1,10 @@
+galera-3 (25.3.20-1+rpi1) buster-staging; urgency=medium
+
+  * Disable testsuite.
+  * Fix clean target
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 01 Aug 2017 21:43:08 +0000
+
 galera-3 (25.3.20-1) unstable; urgency=low
 
   * Update Vcs-* URLs to use secure connections
diff -Nru galera-3-25.3.20/scripts/packages/debian/rules galera-3-25.3.20/scripts/packages/debian/rules
--- galera-3-25.3.20/scripts/packages/debian/rules	2017-01-30 18:55:30.000000000 +0000
+++ galera-3-25.3.20/scripts/packages/debian/rules	2017-08-01 21:43:08.000000000 +0000
@@ -19,10 +19,10 @@
 endif
 
 # Run tests by default
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	SCONS_ARGS += tests=1 deterministic_tests=1
-endif
-
+#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+#	SCONS_ARGS += tests=1 deterministic_tests=1
+#endif
+SCONS_ARGS += tests=0 deterministic_tests=0
 
 override_dh_auto_build:
 	# Print build env info to help debug builds on different platforms
@@ -47,4 +47,17 @@
 %:
 	dh $@
 
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f `find . -name *.o`
+	rm -f `find . -name *.a`
+	rm -f `find . -name *.os`
+	rm -rf .sconf_temp
+	rm -f FAIL  .sconsign.dblite
+	rm -f galera/tests/galera_check
+	rm -f galerautils/tests/gu_tests
+	rm -f galerautils/tests/gu_tests++
+	rm -f config.log galera/tests/galera_check.passed galera_check.log galerautils/tests/gu_tests.passed gu_tests++.log gu_tests.log
+
+
 .PHONY: override_dh_strip