diff --git a/WebDriverTests/imported/w3c/webdriver/tests/conftest.py b/WebDriverTests/imported/w3c/webdriver/tests/conftest.py
index e1491a68026..b7b8b83c9a3 100644
--- a/WebDriverTests/imported/w3c/webdriver/tests/conftest.py
+++ b/WebDriverTests/imported/w3c/webdriver/tests/conftest.py
@@ -1,8 +1,9 @@
 import pytest
 from tests.support.fixtures import (
-    configuration, create_dialog, create_frame, create_window, http,
-    new_session, server_config, session, url)
+    add_browser_capabilites, configuration, create_dialog, create_frame,
+    create_window, http, new_session, server_config, session, url)

+pytest.fixture()(add_browser_capabilites)
 pytest.fixture(scope="session")(configuration)
 pytest.fixture()(create_dialog)
 pytest.fixture()(create_frame)
diff --git a/WebDriverTests/imported/w3c/webdriver/tests/sessions/new_session/create_alwaysMatch.py b/WebDriverTests/imported/w3c/webdriver/tests/sessions/new_session/create_alwaysMatch.py
index 0128c45d4fe..23350488ddc 100644
--- a/WebDriverTests/imported/w3c/webdriver/tests/sessions/new_session/create_alwaysMatch.py
+++ b/WebDriverTests/imported/w3c/webdriver/tests/sessions/new_session/create_alwaysMatch.py
@@ -8,6 +8,6 @@ from support.create import valid_data


 @pytest.mark.parametrize("key,value", flatten(product(*item) for item in valid_data))
-def test_valid(new_session, key, value):
-    resp = new_session({"capabilities": {"alwaysMatch": {key: value}}})
+def test_valid(new_session, add_browser_capabilites, key, value):
+    resp = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({key: value})}})

diff --git a/WebDriverTests/imported/w3c/webdriver/tests/sessions/new_session/create_firstMatch.py b/WebDriverTests/imported/w3c/webdriver/tests/sessions/new_session/create_firstMatch.py
index f0540309108..aab9af06ac5 100644
--- a/WebDriverTests/imported/w3c/webdriver/tests/sessions/new_session/create_firstMatch.py
+++ b/WebDriverTests/imported/w3c/webdriver/tests/sessions/new_session/create_firstMatch.py
@@ -8,5 +8,5 @@ from support.create import valid_data


 @pytest.mark.parametrize("key,value", flatten(product(*item) for item in valid_data))
-def test_valid(new_session, key, value):
-    resp = new_session({"capabilities": {"firstMatch": [{key: value}]}})
+def test_valid(new_session, add_browser_capabilites, key, value):
+    resp = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({}), "firstMatch": [{key: value}]}})
diff --git a/WebDriverTests/imported/w3c/webdriver/tests/support/fixtures.py b/WebDriverTests/imported/w3c/webdriver/tests/support/fixtures.py
index d93f862578a..73d6abeeb4a 100644
--- a/WebDriverTests/imported/w3c/webdriver/tests/support/fixtures.py
+++ b/WebDriverTests/imported/w3c/webdriver/tests/support/fixtures.py
@@ -8,7 +8,7 @@ import mozlog

 from tests.support.asserts import assert_error
 from tests.support.http_request import HTTPRequest
-from tests.support import merge_dictionaries
+from tests.support import merge_dictionaries, overwrite_dictionary

 default_host = "http://127.0.0.1"
 default_port = "4444"
@@ -188,8 +188,6 @@ def new_session(configuration, request):
         _session = webdriver.Session(configuration["host"],
                                      configuration["port"],
                                      capabilities=None)
-        # TODO: merge in some capabilities from the confguration capabilities
-        # since these might be needed to start the browser
         value = _session.send_command("POST", "session", body=body)
         # Don't set the global session until we are sure this succeeded
         _current_session = _session
@@ -203,6 +201,16 @@ def new_session(configuration, request):
     return create_session


+def add_browser_capabilites(configuration):
+    def update_capabilities(capabilities):
+        # Make sure there aren't keys in common.
+        assert not set(configuration["capabilities"]).intersection(set(capabilities))
+        result = dict(configuration["capabilities"])
+        result.update(capabilities)
+        return result
+    return update_capabilities
+
+
 def url(server_config):
     def inner(path, protocol="http", query="", fragment=""):
         port = server_config["ports"][protocol][0]