diff --git a/.travis.yml b/.travis.yml
index c1a7bf55d..dc93c9817 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,10 +26,13 @@ jobs:
       - stage: "System Tests"
         name: "Test environment setup"
         script: bash scripts/prepareServerJars.sh
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
 cache:
   directories:
     - '$HOME/.m2/repository'
     - '$HOME/.sonar/cache'
-    - '$HOME/.gradle'
-    - '.gradle'
+    - '$HOME/.gradle/caches/'
+    - '$HOME/.gradle/wrapper/'
     - '$HOME/servers/'