diff --git a/.travis.yml b/.travis.yml
index 93d04c68..9a8daf87 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,29 +2,27 @@ language: android
 jdk: oraclejdk8
 sudo: false
 
-env:
-  global:
-    - ANDROID_TARGET=android-23
-    - ANDROID_ABI=armeabi-v7a
-    - BUILD_TOOLS_VERSION=26.0.0
-    - TARGET_SDK_LEVEL=26
-
 android:
   components:
-    - tools
     - platform-tools
-    - build-tools-${BUILD_TOOLS_VERSION}
-    - android-23
-    - android-${TARGET_SDK_LEVEL}
+    - tools
+    - build-tools-26.0.0
+    - android-22
+    - android-26
+    - sys-img-armeabi-v7a-android-22
     - extra-android-m2repository
-    - sys-img-${ANDROID_ABI}-${ANDROID_TARGET}
+    - extra-android-support
+    - extra-google-m2repository
 
-script:
-  - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
+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-wait-for-emulator
-  - adb shell setprop dalvik.vm.dexopt-flags v=n,o=v
-  - ./gradlew clean connectedDebugAndroidTest
+  - adb shell input keyevent 82 &
+
+script:
+  - travis_wait 90 ./gradlew clean connectedDebugAndroidTest --stacktrace
   - ./gradlew jacocoDebugReport
 
 after_success: