diff --git a/.travis.yml b/.travis.yml
index 71612c9de..f271e2c1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,8 +32,7 @@ before_install:
   #- emulator -avd test -no-skin -no-audio -no-window &
 
 #before_script:
-  #- chmod +x .wait_for_emulator.sh
-  #- ./.wait_for_emulator.sh
+  #- adb wait-for-device
   #- adb shell input keyevent 82 &
 
 script:
diff --git a/.wait_for_emulator.sh b/.wait_for_emulator.sh
deleted file mode 100644
index 207f028c1..000000000
--- a/.wait_for_emulator.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-bootanim=""
-failcounter=0
-until [[ "$bootanim" =~ "stopped" ]]; 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