diff --git a/.travis.yml b/.travis.yml
index 2573011b..926ed38f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,14 @@
 sudo: false
 language: android
+jdk:
+  - oraclejdk8
 android:
   components:
   - platform-tools
   - tools
-  - build-tools-23.0.3
-  - android-23
-  - sys-img-armeabi-v7a-android-23
+  - build-tools-24.0.0
+  - android-24
+  - sys-img-armeabi-v7a-android-24
 branches:
   only:
   - master
diff --git a/test_client/build.gradle b/test_client/build.gradle
index 98eb672d..94434e82 100644
--- a/test_client/build.gradle
+++ b/test_client/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:2.1.2'
     }
 }