diff --git a/java/com.sap.sailing.selenium.test/local-test-environment.xml b/java/com.sap.sailing.selenium.test/local-test-environment.xml
index 75f0d53540a..12359527203 100755
--- a/java/com.sap.sailing.selenium.test/local-test-environment.xml
+++ b/java/com.sap.sailing.selenium.test/local-test-environment.xml
@@ -39,10 +39,10 @@
      <system-property>
         <name>webdriver.firefox.bin</name>
         <!-- Default binary location on Windows: -->
-        <!--  <value>c:/Program Files (x86)/Mozilla Firefox/firefox.exe</value>-->
+        <value>c:/Program Files (x86)/Mozilla Firefox/firefox.exe</value>
         <!--  -->
         <!-- Default binary location on Linux: -->
-        <value>/home/jan/Downloads/firefox/firefox</value> 
+        <!-- <value>/usr/bin/firefox</value> --> 
      </system-property>
   </system-properties>
   
diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/HostPage.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/HostPage.java
index 42fc19e4cc7..145fe69a903 100644
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/HostPage.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/HostPage.java
@@ -20,7 +20,7 @@ public class HostPage extends PageObject {
     protected static final int DEFAULT_PAGE_LOAD_TIMEOUT = 60;
     
     public static final String getGWTCodeServer() {
-        String codeServer = "127.0.0.1:50802";//System.getProperty(GWT_CODE_SERVER_PARAMETER_NAME);
+        String codeServer = System.getProperty(GWT_CODE_SERVER_PARAMETER_NAME);
         if (codeServer == null) {
             return NO_CODE_SERVER_PARAMTER_VALUE;
         }