diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 23798b563..0c3174062 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,9 +56,11 @@ connected24:
     AVD_SDK: "24"
   script:
     - ./gradlew assembleDebug -PdisablePreDex
+    - android list avd
     - emulator64-arm -avd fcl-test-$AVD_SDK -no-audio -no-window &
     - ./tools/wait-for-emulator
     - adb shell input keyevent 82 &
+    - adb devices
     - export EXITVALUE=0
     - ./gradlew connectedCheck -PdisablePreDex || {
         adb -e logcat -d '*:E';
diff --git a/build.gradle b/build.gradle
index 9653f5be2..749954481 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        // 2.2.2 is the version that is included in Debian/stretch
+        classpath 'com.android.tools.build:gradle:2.2.2'
         classpath files('libs/gradle-witness.jar')
     }
 }
diff --git a/extern/support-v4-preferencefragment/build.gradle b/extern/support-v4-preferencefragment/build.gradle
index 59bd0dc11..e677e406f 100644
--- a/extern/support-v4-preferencefragment/build.gradle
+++ b/extern/support-v4-preferencefragment/build.gradle
@@ -4,7 +4,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.10.+'
+        // 2.2.2 is the version that is included in Debian/stretch
+        classpath 'com.android.tools.build:gradle:2.2.2'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 501e1c448..73aaa14be 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
-distributionSha256Sum=c7de3442432253525902f7e8d7eac8b5fd6ce1623f96d76916af6d0e383010fc
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip
+distributionSha256Sum=9843a3654d3e57dce54db06d05f18b664b95c22bf90c6becccb61fc63ce60689