diff --git a/.travis.yml b/.travis.yml
index 255ce0da8..35a9390fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,14 @@ language: android
 jdk: oraclejdk7
 env:
   matrix:
-    - ANDROID_SDKS=android-19,sysimg-19 ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a
+    - ANDROID_SDKS=android-21,sysimg-19 ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a
 android:
   components:
-    - build-tools-20.0.0
+    - android-21
+    - platform-tools-21
+    - build-tools-21.0.2
   licenses:
-    - android-sdk-license-5be876d5
+    - 'android-sdk-license-.+'
 
 before_install:
   - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
diff --git a/api/build.gradle b/api/build.gradle
index 4b6f18c1c..50b145a42 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -8,8 +8,8 @@ android {
     lintOptions {
         lintConfig file("../lint.xml")
     }
-    compileSdkVersion 19
-    buildToolsVersion "20"
+    compileSdkVersion 21
+    buildToolsVersion "21.0.2"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
diff --git a/astrid/build.gradle b/astrid/build.gradle
index fe3b8bf37..fa1a92b86 100644
--- a/astrid/build.gradle
+++ b/astrid/build.gradle
@@ -9,8 +9,8 @@ android {
         lintConfig file("../lint.xml")
     }
 
-    compileSdkVersion 19
-    buildToolsVersion "20"
+    compileSdkVersion 21
+    buildToolsVersion "21.0.2"
 
     defaultConfig {
         minSdkVersion 7
diff --git a/build.gradle b/build.gradle
index e00852d23..9c1deda26 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,6 +8,6 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.13.0'
+        classpath 'com.android.tools.build:gradle:0.13.3'
     }
 }