diff --git a/.travis.yml b/.travis.yml
index d800fe4f3..fdb96049d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,23 +2,27 @@ language: android
 sudo: required
 jdk: oraclejdk8
 env:
+  global:
+    - TARGET_API=26
+    - BUILD_TOOLS=26.0.2
   matrix:
-    - ANDROID_TARGET=android-21 ANDROID_ABI=armeabi-v7a
+    - EMULATOR_API=21 ANDROID_ABI=armeabi-v7a
 android:
   components:
     - tools # https://github.com/travis-ci/travis-ci/issues/5049
     - tools # https://github.com/travis-ci/travis-ci/issues/6040
-    - android-26
-    - sys-img-armeabi-v7a-android-21
+    - android-$TARGET_API
+    - android-$EMULATOR_API
+    - sys-img-$ANDROID_ABI-android-$EMULATOR_API
     - platform-tools
-    - build-tools-26.0.1
+    - build-tools-$BUILD_TOOLS
     - extra-android-m2repository
     - extra-google-m2repository
   licenses:
     - 'android-sdk-license-.+'
 
 before_install:
-  - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
+  - echo no | android create avd --force -n test -t android-$EMULATOR_API --abi $ANDROID_ABI
   - emulator -avd test -no-skin -no-audio -no-window &
   - ./.wait_for_emulator.sh
   - adb shell input keyevent 82 &
diff --git a/app/src/androidTest/java/org/tasks/jobs/JobQueueTest.java b/app/src/androidTest/java/org/tasks/jobs/JobQueueTest.java
index fe1c5de11..99c157b19 100644
--- a/app/src/androidTest/java/org/tasks/jobs/JobQueueTest.java
+++ b/app/src/androidTest/java/org/tasks/jobs/JobQueueTest.java
@@ -15,6 +15,7 @@ import org.tasks.time.DateTime;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import static com.google.common.collect.Sets.newHashSet;
 import static com.todoroo.astrid.reminders.ReminderService.TYPE_DUE;
 import static com.todoroo.astrid.reminders.ReminderService.TYPE_SNOOZE;
 import static java.util.Arrays.asList;
@@ -63,9 +64,9 @@ public class JobQueueTest {
 
         Freeze.freezeAt(now).thawAfter(new Snippet() {{
             assertEquals(
-                    asList(new Alarm(1, 1, now),
+                    newHashSet(new Alarm(1, 1, now),
                             new Reminder(1, now, TYPE_DUE)),
-                    queue.getOverdueJobs());
+                    newHashSet(queue.getOverdueJobs()));
         }});
     }