diff --git b2g/installer/Makefile.in b2g/installer/Makefile.in
index 754312a..c69904c 100644
--- b2g/installer/Makefile.in
+++ b2g/installer/Makefile.in
@@ -63,6 +63,10 @@ ifneq (,$(filter rtsp,$(NECKO_PROTOCOLS)))
 DEFINES += -DMOZ_RTSP
 endif
 
+ifdef MOZ_DEBUG
+DEFINES += -DMOZ_DEBUG=1
+endif
+
 ifdef GKMEDIAS_SHARED_LIBRARY
 DEFINES += -DGKMEDIAS_SHARED_LIBRARY
 endif
diff --git b2g/installer/package-manifest.in b2g/installer/package-manifest.in
index 17d433c..0416187 100644
--- b2g/installer/package-manifest.in
+++ b2g/installer/package-manifest.in
@@ -576,7 +576,7 @@
 @BINPATH@/components/MozKeyboard.js
 @BINPATH@/components/InputMethod.manifest
 
-#ifdef MOZ_DEBUG
+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
 @BINPATH@/components/TestInterfaceJS.js
 @BINPATH@/components/TestInterfaceJS.manifest
 #endif
diff --git browser/installer/package-manifest.in browser/installer/package-manifest.in
index b509fd4..195345c 100644
--- browser/installer/package-manifest.in
+++ browser/installer/package-manifest.in
@@ -583,7 +583,7 @@
 @BINPATH@/components/MozKeyboard.js
 @BINPATH@/components/InputMethod.manifest
 
-#ifdef MOZ_DEBUG
+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
 @BINPATH@/components/TestInterfaceJS.js
 @BINPATH@/components/TestInterfaceJS.manifest
 #endif
diff --git mobile/android/installer/Makefile.in mobile/android/installer/Makefile.in
index 96dceab..3528ad6 100644
--- mobile/android/installer/Makefile.in
+++ mobile/android/installer/Makefile.in
@@ -41,6 +41,10 @@ BINPATH = bin
 endif
 DEFINES += -DBINPATH=$(BINPATH)
 
+ifdef MOZ_DEBUG
+DEFINES += -DMOZ_DEBUG=1
+endif
+
 ifdef ENABLE_MARIONETTE
 DEFINES += -DENABLE_MARIONETTE=1
 endif
diff --git mobile/android/installer/package-manifest.in mobile/android/installer/package-manifest.in
index 994580b..cf142df 100644
--- mobile/android/installer/package-manifest.in
+++ mobile/android/installer/package-manifest.in
@@ -440,7 +440,7 @@
 @BINPATH@/components/dom_webspeechsynth.xpt
 #endif
 
-#ifdef MOZ_DEBUG
+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
 @BINPATH@/components/TestInterfaceJS.js
 @BINPATH@/components/TestInterfaceJS.manifest
 #endif