diff --git a/.travis.yml b/.travis.yml
index 25241fcc..21ca0134 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,8 @@ jdk: oraclejdk8
 android:
   components:
     - tools
+    - android-25
+    - build-tools-25.0.0
     - platform-tools
     - build-tools-25.0.0
     - android-25
@@ -19,15 +21,14 @@ before_install:
 # Cache gradle dependencies
 # https://docs.travis-ci.com/user/languages/android/#Caching
 before_cache:
-  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
 cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
 
 script:
-  # Lint fails because travis doesn't have platform-tools 24
-  # https://github.com/travis-ci/travis-ci/issues/6699
-  #- ./gradlew lint
+  - ./gradlew clean lint
   - ./gradlew buildNative assembleDebug
   - ./gradlew compileFatDebugAndroidTestSources