diff --git a/package.json b/package.json
index 4852d1a7fe..112a1db4b7 100644
--- a/package.json
+++ b/package.json
@@ -83,6 +83,7 @@
     "eslint-plugin-sorting": "git://github.com/shane-tomlinson/eslint-plugin-sorting.git#bcacb99d",
     "firefox-profile": "0.3.12",
     "fxa-conventional-changelog": "1.1.0",
+    "geckodriver": "1.0.1",
     "grunt-amdcheck": "1.3.2",
     "grunt-bump": "0.7.0",
     "grunt-contrib-csslint": "1.0.0",
diff --git a/tests/tools/firefox_profile_creator.js b/tests/tools/firefox_profile_creator.js
index 892cf499d6..5926649ed3 100644
--- a/tests/tools/firefox_profile_creator.js
+++ b/tests/tools/firefox_profile_creator.js
@@ -4,6 +4,8 @@
 
 var UA_OVERRIDE = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:40.0) Gecko/20100101 Firefox/40.0 FxATester/1.0';
 
+var path = require('path');
+
 var FirefoxProfile = require('firefox-profile');
 var myProfile = new FirefoxProfile();
 var profile = null;
@@ -41,6 +43,10 @@ if (profile) {
   // disable signed extensions
   // the WebDriver extension will not work where signed extensions are forced
   myProfile.setPreference('xpinstall.signatures.required', false);
+  // Firefox 48+ requires marionette settngs
+  myProfile.setPreference('marionette', true);
+  myProfile.setPreference('webdriver.gecko.driver', path.join(__dirname, 'node_modules', 'geckodriver', 'geckodriver'));
+
   // disable WebDriver extension compat check
   myProfile.setPreference('extensions.checkCompatibility.47.0', false);
   myProfile.setPreference('extensions.checkCompatibility.48.0', false);