diff --git a/.travis.yml b/.travis.yml
index 00fa57dc1..f394d422b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,45 @@
+#See https://docs.travis-ci.com/user/languages/android/
+#See https://github.com/ankidroid/Anki-Android/blob/master/.travis.yml
 language: android
-dist: trusty
+
+env:
+  global:
+    - ADB_INSTALL_TIMEOUT=8
+    - ABI=armeabi-v7a
+    - EMU_FLAVOR=default
+    # PATH order is incredibly important. e.g. the 'emulator' script exists in more than one place!
+    - ANDROID_HOME=/usr/local/android-sdk
+    - TOOLS=${ANDROID_HOME}/tools
+    - PATH=${ANDROID_HOME}:${ANDROID_HOME}/emulator:${TOOLS}:${TOOLS}/bin:${ANDROID_HOME}/platform-tools:${PATH}
+  matrix:
+    - API=27 ABI=x86_64
 
 android:
   components:
+    # installing tools to start, then use `sdkmanager` below to get the rest
+    - tools
     - build-tools-28.0.3
-    - android-29
+    - android-28
+
+# Emulator Management: Create, Start and Wait
+install:
+  - echo y | sdkmanager "platform-tools"
+  - echo y | sdkmanager --channel=4 "emulator"
+  - echo y | sdkmanager "system-images;android-$API;$EMU_FLAVOR;$ABI"
+  - echo no | avdmanager create avd --force -n test -k "system-images;android-$API;$EMU_FLAVOR;$ABI" -c 10M
+  - emulator -verbose -avd test -no-accel -no-snapshot -no-window -camera-back none -camera-front none -selinux permissive -qemu -m 2048 &
+  - android-wait-for-emulator
+  - adb shell input keyevent 82 &
 
 script:
-  - ./gradlew build
-  - ./gradlew connectedCheck
\ No newline at end of file
+  - ./gradlew clean build
+  - ./gradlew connectedCheck
+
+sbefore_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+    - $HOME/.android/build-cache
\ No newline at end of file
diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderUtilsImplTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderUtilsImplTest.java
index 432c0577e..d63f46771 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderUtilsImplTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderUtilsImplTest.java
@@ -214,7 +214,6 @@ public class CustomContentProviderUtilsImplTest {
         Track track = providerUtils.createTrack(cursorMock);
         Assert.assertEquals(trackId, track.getId());
         Assert.assertEquals(name, track.getName());
-        verify(cursorMock);
     }
 
     /**
@@ -414,7 +413,6 @@ public class CustomContentProviderUtilsImplTest {
         Assert.assertEquals(id, waypoint.getId());
         Assert.assertEquals(name, waypoint.getName());
         Assert.assertEquals(trackId, waypoint.getTrackId());
-        verify(cursorMock);
     }
 
     /**