diff --git a/.travis.yml b/.travis.yml
index dd37e02..e543b9b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,20 @@
 language: android
+android:
+  components:
+    - build-tools-21.0.2
+    - sys-img-x86-android-21
+    - android-21
+    - extra-android-support
+    - extra-google-m2repository
+    - extra-android-m2repository
+
 env:
   matrix:
-    - ANDROID_SDKS=android-19,sysimg-19 ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a
-
-before_install:
-  - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
-  - emulator -avd test -no-skin -no-audio -no-window &
+    - ANDROID_SDKS=android-21,sysimg-21 ANDROID_TARGET=android-21 ANDROID_ABI=x86_64
 
 before_script:
+  - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
+  - emulator -avd test -no-skin -no-audio -no-window &
   - bash ./wait_for_emulator
   - adb shell input keyevent 82 &