diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 746d1db75..36cfd4965 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: mvdan/fdroid-ci:client-20160706
+image: mvdan/fdroid-ci:client-20160709
 
 cache:
   paths:
@@ -47,12 +47,12 @@ connected10:
     - exit $EXITVALUE
   allow_failure: true  # remove once install segfaults are gone
 
-connected23:
+connected24:
   variables:
-    AVD_SDK: "23"
+    AVD_SDK: "24"
   script:
     - export GRADLE_USER_HOME=$PWD/.gradle
-    - emulator64-arm -avd fcl-test-$AVD_SDK -no-skin -no-audio -no-window &
+    - emulator64-x86 -avd fcl-test-$AVD_SDK -no-skin -no-audio -no-window &
     - ./tools/wait-for-emulator
     - adb shell input keyevent 82 &
     - export EXITVALUE=0