diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1318fdc..a3c14f72 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ variables:
   ANDROID_COMPILE_SDK: "28"
   ANDROID_BUILD_TOOLS: "28.0.3"
   SDK_TOOLS: "4333796" # from https://developer.android.com/studio/#command-tools
-  EMULATOR_VERSION: "23"
+  EMULATOR_VERSION: "22"
   
 before_script:
   - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${SDK_TOOLS}.zip
@@ -14,6 +14,7 @@ before_script:
   - printf "8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e" > android-sdk-linux/licenses/android-sdk-license
   - printf "84831b9409646a918e30573bab4c9c91346d8abd" > android-sdk-linux/licenses/android-sdk-preview-license
   - android-sdk-linux/tools/bin/sdkmanager --update > update.log
+  - android-sdk-linux/tools/bin/sdkmanager "system-images;android-25;google_apis;x86"
   - android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" "build-tools;${ANDROID_BUILD_TOOLS}" "extras;google;m2repository" "extras;android;m2repository" > installPlatform.log
 
   - export ANDROID_HOME=$PWD/android-sdk-linux
@@ -29,8 +30,8 @@ instrumentedTests:
     - wget --quiet --output-document=android-wait-for-emulator https://raw.githubusercontent.com/travis-ci/travis-cookbooks/0f497eb71291b52a703143c5cd63a217c8766dc9/community-cookbooks/android-sdk/files/default/android-wait-for-emulator
     - chmod +x android-wait-for-emulator
     - android-sdk-linux/tools/bin/sdkmanager --update > update.log
-    - android-sdk-linux/tools/bin/sdkmanager "platform-tools" "emulator" "system-images;android-${EMULATOR_VERSION};default;armeabi-v7a"  > installEmulator.log
-    - echo no | android-sdk-linux/tools/bin/avdmanager create avd -n test -k "system-images;android-${EMULATOR_VERSION};default;armeabi-v7a"
+    - android-sdk-linux/tools/bin/sdkmanager "platform-tools" "emulator" "system-images;android-24;default;armeabi-v7a"  > installEmulator.log
+    - echo no | android-sdk-linux/tools/bin/avdmanager create avd -n test -k "system-images;android-24;default;armeabi-v7a"
     - android-sdk-linux/emulator/emulator -avd test -no-window -no-audio &
     - ./android-wait-for-emulator
     - adb shell input keyevent 82