diff --git a/serenity-core/src/main/java/net/thucydides/core/webdriver/WebDriverFactory.java b/serenity-core/src/main/java/net/thucydides/core/webdriver/WebDriverFactory.java
index 1435c95594..1e55aeab54 100644
--- a/serenity-core/src/main/java/net/thucydides/core/webdriver/WebDriverFactory.java
+++ b/serenity-core/src/main/java/net/thucydides/core/webdriver/WebDriverFactory.java
@@ -359,7 +359,7 @@ private DesiredCapabilities capabilitiesForDriver(String driver) {
 
         Preconditions.checkNotNull(driverType, "Unsupported remote driver type: ");
 
-        if (driverType == SupportedWebDriver.REMOTE) {
+        if (shouldUseARemoteDriver()) {
             return (DesiredCapabilities) enhancedCapabilities(remoteCapabilities());
         } else {
             return (DesiredCapabilities) enhancedCapabilities(realBrowserCapabilities(driverType));
@@ -418,7 +418,11 @@ private DesiredCapabilities realBrowserCapabilities(SupportedWebDriver driverTyp
     }
 
     private DesiredCapabilities remoteCapabilities() {
-        String remoteBrowser = ThucydidesSystemProperty.WEBDRIVER_REMOTE_DRIVER.from(environmentVariables, "firefox");
+        String remoteBrowser = ThucydidesSystemProperty.WEBDRIVER_REMOTE_DRIVER.from(environmentVariables, getDriverFrom(environmentVariables));
+        if (remoteBrowser == null) {
+            remoteBrowser = "firefox";
+        }
+
         DesiredCapabilities capabilities = realBrowserCapabilities(driverTypeFor(remoteBrowser));
         capabilities.setCapability("idle-timeout",EXTRA_TIME_TO_TAKE_SCREENSHOTS);
 
@@ -431,9 +435,10 @@ private DesiredCapabilities remoteCapabilities() {
         }
 
         if (environmentVariables.getProperty(ThucydidesSystemProperty.WEBDRIVER_REMOTE_BROWSER_VERSION) != null) {
-            capabilities.setCapability("version", Platform.valueOf(environmentVariables.getProperty(ThucydidesSystemProperty.WEBDRIVER_REMOTE_BROWSER_VERSION)));
+            capabilities.setCapability("version", environmentVariables.getProperty(ThucydidesSystemProperty.WEBDRIVER_REMOTE_BROWSER_VERSION));
         }
 
+
         return capabilities;
     }