diff -Nru firefox-esr-45.3.0esr/debian/changelog firefox-esr-45.3.0esr/debian/changelog
--- firefox-esr-45.3.0esr/debian/changelog	2016-08-02 21:33:48.000000000 +0000
+++ firefox-esr-45.3.0esr/debian/changelog	2016-09-11 07:53:00.000000000 +0000
@@ -1,3 +1,10 @@
+firefox-esr (45.3.0esr-1+rpi1) stretch-staging; urgency=medium
+
+  * Force build with gcc/g++ 5
+  * Disable testsuite.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 11 Sep 2016 07:53:00 +0000
+
 firefox-esr (45.3.0esr-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru firefox-esr-45.3.0esr/debian/rules firefox-esr-45.3.0esr/debian/rules
--- firefox-esr-45.3.0esr/debian/rules	2016-08-02 21:31:14.000000000 +0000
+++ firefox-esr-45.3.0esr/debian/rules	2016-09-11 07:53:00.000000000 +0000
@@ -116,12 +116,12 @@
 	GENSYMBOLS_FLAGS := -c4
 endif
 
-ifeq (default,$(origin CC))
-CC := gcc
-endif
-ifeq (default,$(origin CXX))
-CXX := g++
-endif
+#ifeq (default,$(origin CC))
+CC := gcc-5
+#endif
+#ifeq (default,$(origin CXX))
+CXX := g++-5
+#endif
 
 CXXFLAGS = $(CFLAGS)
 
@@ -243,13 +243,16 @@
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 # Disable tests on stable-security
 ifeq (,$(findstring ~deb,$(DEBIAN_RELEASE)))
-include debian/test.mk
+#include debian/test.mk
 endif
 endif
 
 override_dh_auto_clean::
 	rm -f MPL
 	rm -f $(GENERATED_FILES)
+	rm -rf debian/locales
+	rm -rf python/psutil/build/*.linux-armv7l-2.7
+	rm -rf python/psutil/psutil/*.so
 	rm -f configure js/src/configure
 	rm -rf stamps l10n
 	debian/rules debian/control TESTDIR=