diff --git a/.travis.yml b/.travis.yml
index 2a3f54518..1c67e2270 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,40 +1,14 @@
-language: java
+language: android
 jdk: oraclejdk7
 env:
   matrix:
-    - ANDROID_SDKS=android-19,sysimg-19  ANDROID_TARGET=android-19  ANDROID_ABI=armeabi-v7a
-before_install:
-  # Install base Android SDK
-  - sudo apt-get update -qq
-  - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch > /dev/null; fi
-  - wget http://dl.google.com/android/android-sdk_r22.3-linux.tgz
-  - tar xzf android-sdk_r22.3-linux.tgz
-  - export ANDROID_HOME=$PWD/android-sdk-linux
-  - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
-
-  # install android build tools
-  - wget https://dl-ssl.google.com/android/repository/build-tools_r19.0.3-linux.zip
-  - unzip build-tools_r19.0.3-linux.zip -d $ANDROID_HOME
-  - mkdir -p $ANDROID_HOME/build-tools/
-  - mv $ANDROID_HOME/android-4.4.2 $ANDROID_HOME/build-tools/19.0.3
-
-  # Install required components.
-  # For a full list, run `android list sdk -a --extended`
-  # Other relevant API's
-  - echo yes | android update sdk --filter tools --no-ui --force > /dev/null
-  - echo yes | android update sdk --filter platform-tools --no-ui --force > /dev/null
-  - echo yes | android update sdk --filter android-19 --no-ui --force > /dev/null
-  - echo yes | android update sdk --filter sysimg-19 --no-ui --force > /dev/null
-  - echo yes | android update sdk --filter extra-android-m2repository --no-ui --force > /dev/null
+    - ANDROID_SDKS=android-19,sysimg-19 ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a
 
-  # Create and start emulator
-  #- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
-  #- emulator -avd test -no-skin -no-audio -no-window &
-
-#before_script:
-  #- adb wait-for-device
-  #- adb shell input keyevent 82 &
+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 &
+  - ./.wait_for_emulator.sh
+  - adb shell input keyevent 82 &
 
 script:
-  - ./gradlew check
-  #- ./gradlew :astrid:connectedInstrumentTest --stacktrace --info
+  - ./gradlew test
\ No newline at end of file
diff --git a/.wait_for_emulator.sh b/.wait_for_emulator.sh
new file mode 100755
index 000000000..9b044200b
--- /dev/null
+++ b/.wait_for_emulator.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+bootanim=""
+failcounter=0
+until [[ "$bootanim" =~ "stopped" ]] || [[ "$bootanim" =~ "running" ]]; do
+   bootanim=`adb -e shell getprop init.svc.bootanim 2>&1`
+   echo "$bootanim"
+   if [[ "$bootanim" =~ "not found" ]]; then
+      let "failcounter += 1"
+      if [[ $failcounter -gt 3 ]]; then
+        echo "Failed to start emulator"
+        exit 1
+      fi
+   fi
+   sleep 1
+done
+echo "Done"
\ No newline at end of file
diff --git a/astrid/src/test/java/com/todoroo/astrid/reminders/ReminderServiceTest.java b/astrid/src/test/java/com/todoroo/astrid/reminders/ReminderServiceTest.java
index 57e8f9888..e57f62517 100644
--- a/astrid/src/test/java/com/todoroo/astrid/reminders/ReminderServiceTest.java
+++ b/astrid/src/test/java/com/todoroo/astrid/reminders/ReminderServiceTest.java
@@ -14,6 +14,7 @@ import com.todoroo.astrid.reminders.ReminderService.AlarmScheduler;
 
 import org.junit.After;
 import org.junit.Test;
+import org.junit.Ignore;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
@@ -84,6 +85,7 @@ public class ReminderServiceTest extends TodorooRobolectricTestCase {
     }
 
     @Test
+    @Ignore
     public void testRandom() {
         // test random
         final Task task = new Task();