diff --git a/.travis.yml b/.travis.yml
index 9a8daf87..93e8df0c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,43 @@
 language: android
 jdk: oraclejdk8
-sudo: false
+
+sudo: required
+dist: precise
 
 android:
   components:
     - platform-tools
     - tools
     - build-tools-26.0.0
-    - android-22
     - android-26
-    - sys-img-armeabi-v7a-android-22
+#    - sys-img-armeabi-v7a-android-22
     - extra-android-m2repository
     - extra-android-support
     - extra-google-m2repository
 
+env:
+  matrix:
+    - API=android-16 ABI=armeabi-v7a
+#    - API=android-17 ABI=armeabi-v7a
+#    - API=android-18 ABI=armeabi-v7a
+#    - API=android-19 ABI=armeabi-v7a
+#    - API=android-20 ABI=armeabi-v7a
+#    - API=android-21 ABI=armeabi-v7a
+#    - API=android-22 ABI=armeabi-v7a
+#    - API=android-24 ABI=armeabi-v7a
+#    - API=android-25 ABI=armeabi-v7a
+    - API=android-26 ABI=armeabi-v7a
+
 before_script:
-  # Create and start emulator
-  - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
-  - emulator -avd test -no-skin -no-audio -no-window &
+  - android-update-sdk --components=sys-img-$ABI-$API --accept-licenses='android-sdk-license-[0-9a-f]{8}'
+  - echo no | android create avd --force -n test -t $API --abi $ABI
+  - emulator -avd test -no-audio -no-window
+  - ./gradlew clean assembleDebug assembleDebugAndroidTest
   - android-wait-for-emulator
   - adb shell input keyevent 82 &
 
 script:
-  - travis_wait 90 ./gradlew clean connectedDebugAndroidTest --stacktrace
+  - travis_wait 60 ./gradlew clean connectedDebugAndroidTest --stacktrace
   - ./gradlew jacocoDebugReport
 
 after_success: