diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5140e56e..2b3e35ba4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: mvdan/fdroid-ci:client-20160413
+image: mvdan/fdroid-ci:client-20160429
 
 cache:
   paths:
@@ -36,7 +36,7 @@ gradle:
         --name fcl-test
         --skin $SKIN
         --target android-$AVD_SDK
-    - emulator -force-32bit -avd fcl-test -no-skin -no-audio -no-window &
+    - emulator64-arm -avd fcl-test -no-skin -no-audio -no-window &
     - ./tools/wait-for-emulator
     - adb shell input keyevent 82
     - export EXITVALUE=0
diff --git a/tools/wait-for-emulator b/tools/wait-for-emulator
index 1bb0defdb..97e3bb680 100755
--- a/tools/wait-for-emulator
+++ b/tools/wait-for-emulator
@@ -16,7 +16,7 @@ explain() {
 	elif [[ "$1" =~ "running" ]]; then
 		printf "booting"
 	else
-		printf "unknown: $1"
+		printf "$1"
 	fi
 }
 
@@ -24,17 +24,16 @@ while true; do
 	if [[ $sec -ge $timeout ]]; then
 		err "Timeout ($timeout seconds) reached - Failed to start emulator"
 	fi
-	out=$(adb -e shell getprop init.svc.bootanim 2>&1)
+	out=$(adb -e shell getprop init.svc.bootanim 2>&1 | grep -v '^\*')
 	if [[ "$out" =~ "command not found" ]]; then
 		err "$out"
 	fi
 	if [[ "$out" =~ "stopped" ]]; then
 		break
 	fi
-	exp=$(explain "$out")
 	let "r = sec % 5"
 	if [[ $r -eq 0 ]]; then
-		echo "Waiting for emulator to start: $exp"
+		echo "Waiting for emulator to start: $(explain "$out")"
 	fi
 	sleep 1
 	let "sec++"