diff --git a/.gitlab-ci/android-runner.sh b/.gitlab-ci/android-runner.sh
index 275b5e72063..d6b9fbe9cd7 100755
--- a/.gitlab-ci/android-runner.sh
+++ b/.gitlab-ci/android-runner.sh
@@ -76,9 +76,11 @@ $ADB push /angle/libEGL_angle.so "$ANGLE_DEST_PATH/libEGL_angle.so"
 $ADB push /angle/libGLESv1_CM_angle.so "$ANGLE_DEST_PATH/libGLESv1_CM_angle.so"
 $ADB push /angle/libGLESv2_angle.so "$ANGLE_DEST_PATH/libGLESv2_angle.so"
 
+$ADB push /android-tools/eglinfo /data
+
 get_gles_runtime_version() {
-  while [ "$($ADB shell dumpsys SurfaceFlinger | grep GLES:)" = "" ] ; do sleep 1; done
-  $ADB shell dumpsys SurfaceFlinger | grep GLES
+  while [ "$($ADB shell /data/eglinfo | grep 'OpenGL ES profile version':)" = "" ] ; do sleep 1; done
+  $ADB shell /data/eglinfo | grep 'OpenGL ES profile version'
 }
 
 # Check what GLES implementation is used before loading the new libraries
@@ -101,7 +103,7 @@ if [ -n "$ANGLE_TAG" ]; then
   fi
 else
   MESA_BUILD_VERSION=$(cat "$INSTALL/VERSION")
-  if ! printf "%s" "$GLES_RUNTIME_VERSION" | grep --quiet "${MESA_BUILD_VERSION}$"; then
+  if ! printf "%s" "$GLES_RUNTIME_VERSION" | grep -Fq -- "${MESA_BUILD_VERSION}"; then
      echo "Fatal: Android is loading a wrong version of the Mesa3D GLES libs: ${GLES_RUNTIME_VERSION}" 1>&2
      exit 1
   fi
diff --git a/.gitlab-ci/container/debian/x86_64_test-android.sh b/.gitlab-ci/container/debian/x86_64_test-android.sh
index d474d32fabe..dc7a7603c3e 100755
--- a/.gitlab-ci/container/debian/x86_64_test-android.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-android.sh
@@ -42,6 +42,19 @@ apt-get install -y --no-remove --no-install-recommends \
 
 section_end debian_setup
 
+############### Downloading Android tools
+
+section_start android-tools "Downloading Android tools"
+
+mkdir /android-tools
+pushd /android-tools
+
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+  -o eglinfo "https://${S3_HOST}/${S3_ANDROID_BUCKET}/mesa/mesa/${DATA_STORAGE_PATH}/eglinfo-android-x86_64"
+chmod +x eglinfo
+
+popd
+
 ############### Downloading NDK for native builds for the guest ...
 
 section_start android-ndk "Downloading Android NDK"