diff --git a/.travis.yml b/.travis.yml
index 2573011b..a4fd2295 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
@@ -37,7 +39,7 @@ env:
   - secure: ezKyZbb3q1Phcv/vJntuJe0C2req+Hp4/C+tFZIWZ3o8wRO9jVI3bnED9TWQyQOOT0SoRYjJ5zqp0UcEOGCzPeWFO6bA7RWp+zA/R9sziLNcVWMVv3WXnuClQjPBHJeXRnP7YmNjxDmSfV97a14dk5d9LgJZYliTDepH4dLsxro=
   - secure: HV8REF7bB1i6cBEe4YCZvjgTf6tGiptAPzp9qZXGUH9Lxh6yUjYMXXP8flDaIFcE2JuAakW6P4SPr7/SQ+X4f8/84cNhmU1I+6Y1nG37WvelRHQVslOUDbl1TNUnynYZ+ybkb3BtrQvggCGMdQKvGZXYiggFhN/TWuDo0c7Q2Ro=
   matrix:
-  - ANDROID_TARGET=android-23 ANDROID_ABI=armeabi-v7a
+  - ANDROID_TARGET=android-24 ANDROID_ABI=armeabi-v7a
 addons:
   coverity_scan:
     project:
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f4427996..fe7d2ac0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -30,7 +30,7 @@
 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="23" />
+        android:targetSdkVersion="24" />
 
 </manifest>
 
diff --git a/build.gradle b/build.gradle
index a3e0ccca..d9f9cdbf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.1.2'
     }
 }
 
@@ -18,8 +18,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.0"
 
     sourceSets {
         main {
diff --git a/project.properties b/project.properties
index b2ef7dcc..34c8d58b 100644
--- a/project.properties
+++ b/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-23
+target=android-24
 android.library=true
diff --git a/sample_client/AndroidManifest.xml b/sample_client/AndroidManifest.xml
index 568299b0..ee94e2f0 100644
--- a/sample_client/AndroidManifest.xml
+++ b/sample_client/AndroidManifest.xml
@@ -30,7 +30,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="23" />
+        android:targetSdkVersion="24" />
     <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
         <activity 	android:name="MainActivity"
                   	android:label="@string/app_name"
diff --git a/sample_client/build.gradle b/sample_client/build.gradle
index ab862f2b..770e79ca 100644
--- a/sample_client/build.gradle
+++ b/sample_client/build.gradle
@@ -9,8 +9,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.0"
 
     sourceSets {
         main {
diff --git a/sample_client/project.properties b/sample_client/project.properties
index d8387c3b..07afc2f8 100644
--- a/sample_client/project.properties
+++ b/sample_client/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-23
+target=android-24
 android.library.reference.1=..
diff --git a/test_client/AndroidManifest.xml b/test_client/AndroidManifest.xml
index 018d7259..d16f156a 100644
--- a/test_client/AndroidManifest.xml
+++ b/test_client/AndroidManifest.xml
@@ -39,7 +39,7 @@
 
 	<uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="23" />
+        android:targetSdkVersion="24" />
 
     <application
         android:allowBackup="true"
diff --git a/test_client/build.gradle b/test_client/build.gradle
index 38beb6ae..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'
     }
 }
 
@@ -20,8 +20,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.0"
 
     sourceSets {
         main {
diff --git a/test_client/project.properties b/test_client/project.properties
index d8387c3b..07afc2f8 100644
--- a/test_client/project.properties
+++ b/test_client/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-23
+target=android-24
 android.library.reference.1=..
diff --git a/test_client/tests/project.properties b/test_client/tests/project.properties
index 916037e3..fe3c64ae 100644
--- a/test_client/tests/project.properties
+++ b/test_client/tests/project.properties
@@ -10,5 +10,5 @@
 # To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
-# Project target.
-target=android-23
+# Project target
+target=android-24
\ No newline at end of file