diff --git a/grid_configuration.yml b/grid_configuration.yml
index 3432f7b..766a573 100644
--- a/grid_configuration.yml
+++ b/grid_configuration.yml
@@ -12,6 +12,8 @@ hub:
          browser: "*firefox /Applications/Firefox 10.app/Contents/MacOS/firefox-bin"
        - name: "Firefox 11 on Mac OS X"
          browser: "*firefox /Applications/Firefox 11.app/Contents/MacOS/firefox-bin"
+       - name: "Firefox 12 on Mac OS X"
+         browser: "*firefox /Applications/Firefox 12.app/Contents/MacOS/firefox-bin"
        - name: "Firefox Beta on Mac OS X"
          browser: "*firefox /Applications/Firefox Beta.app/Contents/MacOS/firefox-bin"
        - name: "Firefox Aurora on Mac OS X"
@@ -30,6 +32,8 @@ hub:
          browser: "*firefox C:/Program Files/Mozilla Firefox 10/firefox.exe"
        - name: "Firefox 11 on Windows Vista"
          browser: "*firefox C:/Program Files/Mozilla Firefox 11/firefox.exe"
+       - name: "Firefox 12 on Windows Vista"
+         browser: "*firefox C:/Program Files/Mozilla Firefox 12/firefox.exe"
        - name: "Firefox Beta on Windows Vista"
          browser: "*firefox C:/Program Files/Mozilla Firefox Beta/firefox.exe"
        - name: "Firefox Aurora on Windows Vista"
@@ -51,7 +55,9 @@ hub:
        - name: "Firefox 10 on Windows 7"
          browser: "*firefox C:/Program Files/Mozilla Firefox 10/firefox.exe"
        - name: "Firefox 11 on Windows 7"
-         browser: "*firefox C:/Program Files/Mozilla Firefox 11/firefox.exe"         
+         browser: "*firefox C:/Program Files/Mozilla Firefox 11/firefox.exe"
+       - name: "Firefox 12 on Windows 7"
+         browser: "*firefox C:/Program Files/Mozilla Firefox 12/firefox.exe"
        - name: "Firefox Beta on Windows 7"
          browser: "*firefox C:/Program Files/Mozilla Firefox Beta/firefox.exe"
        - name: "Firefox Aurora on Windows 7"
diff --git a/mac.json b/mac.json
index 69bad5d..fc37521 100644
--- a/mac.json
+++ b/mac.json
@@ -25,6 +25,10 @@
                 "browserName": "Firefox 11 on Mac OS X",
                 "maxInstances": 5,
                 "seleniumProtocol": "Selenium"
+            }, {
+                "browserName": "Firefox 12 on Mac OS X",
+                "maxInstances": 5,
+                "seleniumProtocol": "Selenium"
             }, {
                 "browserName": "firefox",
                 "version": "3.6",
@@ -67,6 +71,13 @@
                 "platform": "MAC",
                 "maxInstances": 1,
                 "seleniumProtocol": "WebDriver"
+            }, {
+                "browserName": "firefox",
+                "version": "12",
+                "firefox_binary": "/Applications/Firefox 12.app/Contents/MacOS/firefox-bin",
+                "platform": "MAC",
+                "maxInstances": 1,
+                "seleniumProtocol": "WebDriver"
             }
         ],
     "configuration": {}
diff --git a/qa-selenium3.mv.mozilla.com.json b/qa-selenium3.mv.mozilla.com.json
index 9ae616d..18df012 100644
--- a/qa-selenium3.mv.mozilla.com.json
+++ b/qa-selenium3.mv.mozilla.com.json
@@ -25,6 +25,10 @@
                 "browserName": "Firefox 11 on Mac OS X",
                 "maxInstances": 5,
                 "seleniumProtocol": "Selenium"
+            }, {
+                "browserName": "Firefox 12 on Mac OS X",
+                "maxInstances": 5,
+                "seleniumProtocol": "Selenium"
             }, {
                 "browserName": "Firefox Beta on Mac OS X",
                 "maxInstances": 5,
@@ -79,6 +83,13 @@
                 "platform": "MAC",
                 "maxInstances": 1,
                 "seleniumProtocol": "WebDriver"
+            }, {
+                "browserName": "firefox",
+                "version": "12",
+                "firefox_binary": "/Applications/Firefox 12.app/Contents/MacOS/firefox-bin",
+                "platform": "MAC",
+                "maxInstances": 1,
+                "seleniumProtocol": "WebDriver"
             }, {
                 "browserName": "firefox",
                 "version": "beta",
diff --git a/win7.json b/win7.json
index d062057..0209c88 100644
--- a/win7.json
+++ b/win7.json
@@ -25,6 +25,10 @@
                 "browserName": "Firefox 11 on Windows 7",
                 "maxInstances": 5,
                 "seleniumProtocol": "Selenium"
+            }, {
+                "browserName": "Firefox 12 on Windows 7",
+                "maxInstances": 5,
+                "seleniumProtocol": "Selenium"
             }, {
                 "browserName": "Internet Explorer 8 on Windows 7",
                 "maxInstances": 1,
@@ -71,6 +75,13 @@
                 "platform": "WINDOWS",
                 "maxInstances": 1,
                 "seleniumProtocol": "WebDriver"
+            }, {
+                "browserName": "firefox",
+                "version": "12",
+                "firefox_binary": "C:/Program Files/Mozilla Firefox 12/firefox.exe",
+                "platform": "WINDOWS",
+                "maxInstances": 1,
+                "seleniumProtocol": "WebDriver"
             }, {
                 "browserName": "internet explorer",
                 "version": "8",
diff --git a/winvista.json b/winvista.json
index 2974651..e4b1745 100644
--- a/winvista.json
+++ b/winvista.json
@@ -25,6 +25,10 @@
                 "browserName": "Firefox 11 on Windows Vista",
                 "maxInstances": 5,
                 "seleniumProtocol": "Selenium"
+            }, {
+                "browserName": "Firefox 12 on Windows Vista",
+                "maxInstances": 5,
+                "seleniumProtocol": "Selenium"
             }, {
                 "browserName": "Internet Explorer 8 on Windows Vista",
                 "maxInstances": 1,
@@ -71,6 +75,13 @@
                 "platform": "WINDOWS",
                 "maxInstances": 1,
                 "seleniumProtocol": "WebDriver"
+            }, {
+                "browserName": "firefox",
+                "version": "12",
+                "firefox_binary": "C:/Program Files/Mozilla Firefox 12/firefox.exe",
+                "platform": "WINDOWS",
+                "maxInstances": 1,
+                "seleniumProtocol": "WebDriver"
             }, {
                 "browserName": "internet explorer",
                 "version": "8",