diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 6d09796458a7..39d83c6fb9da 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -330,10 +330,14 @@
 @RESPATH@/components/PeerConnection.manifest
 #endif
 
+; Remote control protocol
+#ifdef ENABLE_MARIONETTE
 @RESPATH@/chrome/marionette@JAREXT@
 @RESPATH@/chrome/marionette.manifest
 @RESPATH@/components/marionette.manifest
 @RESPATH@/components/marionette.js
+@RESPATH@/defaults/pref/marionette.js
+#endif
 
 @RESPATH@/components/nsAsyncShutdown.manifest
 @RESPATH@/components/nsAsyncShutdown.js
@@ -456,10 +460,6 @@
 ; gre location for now.
 @RESPATH@/defaults/pref/channel-prefs.js
 
-; Remote control protocol prefs
-; defined in ../../testing/marionette/prefs/marionette.js
-@RESPATH@/defaults/pref/marionette.js
-
 ; Services (gre) prefs
 @RESPATH@/defaults/pref/services-sync.js