diff -r 000000000000 -r 6474c204b198 testing/config/mozharness/marionette.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/testing/config/mozharness/marionette.py	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,52 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+config = {
+    "marionette_desktop_options": [
+        "--type=%(type)s",
+        "--binary=%(binary)s",
+        "--address=%(address)s",
+    ],
+    "marionette_emulator_options": [
+        "--type=%(type)s",
+        "--logcat-dir=%(logcat_dir)s",
+        "--emulator=%(emulator)s",
+        "--homedir=%(homedir)s",
+    ],
+    "webapi_emulator_options": [
+        "--type=%(type)s",
+        "--symbols-path=%(symbols_path)s",
+        "--logcat-dir=%(logcat_dir)s",
+        "--emulator=%(emulator)s",
+        "--homedir=%(homedir)s",
+    ],
+    # This combination is not currently run.
+    "webapi_desktop_options": [
+    ],
+    "gaiatest_emulator_options": [
+        "--restart",
+        "--timeout=%(timeout)s",
+        "--type=%(type)s",
+        "--testvars=%(testvars)s",
+        "--profile=%(profile)s",
+        "--symbols-path=%(symbols_path)s",
+        "--xml-output=%(xml_output)s",
+        "--html-output=%(html_output)s",
+        "--logcat-dir=%(logcat_dir)s",
+        "--emulator=%(emulator)s",
+        "--homedir=%(homedir)s",
+    ],
+    "gaiatest_desktop_options": [
+        "--restart",
+        "--timeout=%(timeout)s",
+        "--type=%(type)s",
+        "--testvars=%(testvars)s",
+        "--profile=%(profile)s",
+        "--symbols-path=%(symbols_path)s",
+        "--xml-output=%(xml_output)s",
+        "--html-output=%(html_output)s",
+        "--binary=%(binary)s",
+        "--address=%(address)s",
+    ],
+}