diff --git a/.travis.yml b/.travis.yml
index f145022c6a..0949a2ed37 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,15 @@
 sudo: false
 language: android
+jdk: oraclejdk8
+
 android:
   components:
-    - platform-tools
     - tools
+    - tools
+    - platform-tools
 
     # The BuildTools version used by your project
+    - build-tools-24.0.1
     - build-tools-23.0.3
 
     # The SDK version used to compile your project
@@ -17,9 +21,6 @@ android:
     - extra-android-m2repository
     - extra-android-support
 
-  licenses:
-    - 'android-sdk-license-.+'
-
 before_script:
     - export GRADLE_OPTS="-XX:MaxPermSize=2048m -Xmx1536m"
 
diff --git a/build.gradle b/build.gradle
index df242949ab..6473962ded 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.2'
         classpath 'io.fabric.tools:gradle:1.21.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
@@ -76,4 +76,4 @@ allprojects {
             dirs 'libs'
         }
     }
-}
\ No newline at end of file
+}