--- a/testing/marionette/components/marionette.js
+++ b/testing/marionette/components/marionette.js
@@ -9,17 +9,17 @@ const {Constructor: CC, interfaces: Ci, 
 Cu.import("resource://gre/modules/Log.jsm");
 Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(
     this, "env", "@mozilla.org/process/environment;1", "nsIEnvironment");
 
-const MARIONETTE_CONTRACT_ID = "@mozilla.org/marionette;1";
+const MARIONETTE_CONTRACT_ID = "@mozilla.org/remote/marionette;1";
 const MARIONETTE_CID = Components.ID("{786a1369-dca5-4adc-8486-33d23c88010a}");
 
 const PREF_PORT = "marionette.port";
 const PREF_PORT_FALLBACK = "marionette.defaultPrefs.port";
 const PREF_LOG_LEVEL = "marionette.log.level";
 const PREF_LOG_LEVEL_FALLBACK = "marionette.logging";
 
 const DEFAULT_LOG_LEVEL = "info";

--- a/testing/marionette/components/marionette.manifest
+++ b/testing/marionette/components/marionette.manifest
@@ -1,4 +1,4 @@
 component {786a1369-dca5-4adc-8486-33d23c88010a} marionette.js
-contract @mozilla.org/marionette;1 {786a1369-dca5-4adc-8486-33d23c88010a}
-category command-line-handler b-marionette @mozilla.org/marionette;1
-category profile-after-change Marionette @mozilla.org/marionette;1
+contract @mozilla.org/remote/marionette;1 {786a1369-dca5-4adc-8486-33d23c88010a}
+category command-line-handler b-marionette @mozilla.org/remote/marionette;1
+category profile-after-change Marionette @mozilla.org/remote/marionette;1