diff --git a/.travis.yml b/.travis.yml
index 3b8237c3f..981fe9ef1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,10 +10,11 @@ before_install:
   - sudo apt-get install -y libappindicator1 fonts-liberation
   - wget http://www.slimjet.com/chrome/download-chrome.php?file=lnx%2Fchrome64_48.0.2564.109.deb
   - sudo dpkg -i download-chrome.php?file=lnx%2Fchrome64_48.0.2564.109.deb
-  - cd gateleen-test/src/test/resources/
+  - cd gateleen-test/src/test/resources/chromedriver/
+  - rm chromedriver
   - wget https://chromedriver.storage.googleapis.com/2.21/chromedriver_linux64.zip
   - unzip chromedriver_linux64.zip
-  - cd ..; cd ..; cd ..; cd ..
+  - cd ..; cd ..; cd ..; cd ..; cd ..
 script:
    - ./gradlew build
 #   - ./gradlew gateleen-test:startServer  (also waits for it to come up)
diff --git a/gateleen-test/build.gradle b/gateleen-test/build.gradle
index 5e01f12ee..99f88c44c 100644
--- a/gateleen-test/build.gradle
+++ b/gateleen-test/build.gradle
@@ -50,11 +50,11 @@ dependencies {
 }
 
 test {
-    onlyIf {
-        project.hasProperty("integrationTests")
-    }
-//    filter {
-//        //specific test class, wildcard for packages
-//        includeTestsMatching "*.HookJsUITest"
+//    onlyIf {
+//        project.hasProperty("integrationTests")
 //    }
+    filter {
+        //specific test class, wildcard for packages
+        includeTestsMatching "*.HookJsUITest"
+    }
 }
\ No newline at end of file
diff --git a/gateleen-test/src/test/java/org/swisspush/gateleen/hookjs/HookJsUITest.java b/gateleen-test/src/test/java/org/swisspush/gateleen/hookjs/HookJsUITest.java
index 4d4214ed5..d213ebdec 100644
--- a/gateleen-test/src/test/java/org/swisspush/gateleen/hookjs/HookJsUITest.java
+++ b/gateleen-test/src/test/java/org/swisspush/gateleen/hookjs/HookJsUITest.java
@@ -26,9 +26,9 @@ public class HookJsUITest extends AbstractTest {
     @BeforeClass
     public static void setupChromeDriver() {
 
-        if (System.getProperty("webdriver.chrome.driver") == null) {
-            System.setProperty("webdriver.chrome.driver", "src/test/resources/chromedriver");
-        }
+//        if (System.getProperty("webdriver.chrome.driver") == null) {
+            System.setProperty("webdriver.chrome.driver", "src/test/resources/chromedriver/chromedriver");
+//        }
 
         webDriver = new ChromeDriver();
     }
diff --git a/gateleen-test/src/test/resources/chromedriver/chromedriver b/gateleen-test/src/test/resources/chromedriver/chromedriver
new file mode 100755
index 000000000..adba49a6f
Binary files /dev/null and b/gateleen-test/src/test/resources/chromedriver/chromedriver differ