diff --git a/.gitlab-ci/container/build-skqp.sh b/.gitlab-ci/container/build-skqp.sh
index c0c7107a722..748577ed41c 100755
--- a/.gitlab-ci/container/build-skqp.sh
+++ b/.gitlab-ci/container/build-skqp.sh
@@ -6,11 +6,12 @@
 #
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
+# DEBIAN_TEST_GL_TAG
 # KERNEL_ROOTFS_TAG
 
 set -uex
 
-uncollapsed_section_start skqp "Building skqp"
+uncollapsed_section_start skqp "Building SkQP"
 
 SKQP_BRANCH=android-cts-12.1_r5
 
@@ -75,7 +76,7 @@ popd
 # Fetch some needed build tools needed to build skia/skqp.
 # Basically, it clones repositories with commits SHAs from ${SKIA_DIR}/DEPS
 # directory.
-python tools/git-sync-deps
+python3 tools/git-sync-deps
 
 mkdir -p "${SKQP_OUT_DIR}"
 mkdir -p "${SKQP_INSTALL_DIR}"
diff --git a/.gitlab-ci/container/debian/test-gl.sh b/.gitlab-ci/container/debian/test-gl.sh
index 41435983285..8bda2279c66 100644
--- a/.gitlab-ci/container/debian/test-gl.sh
+++ b/.gitlab-ci/container/debian/test-gl.sh
@@ -27,12 +27,15 @@ EPHEMERAL=(
     libcap-dev
     "libclang-cpp${LLVM_VERSION}-dev"
     libdrm-dev
+    libfontconfig-dev
+    libgl-dev
     libgles2-mesa-dev
+    libglu1-mesa-dev
     libgtest-dev
+    libglx-dev
     libpciaccess-dev
     libpng-dev
     libudev-dev
-    libvulkan-dev
     libwaffle-dev
     libwayland-dev
     libx11-xcb-dev
@@ -50,11 +53,15 @@ EPHEMERAL=(
     ocl-icd-opencl-dev
     patch
     pkgconf
+    python-is-python3
     python3-distutils
     xz-utils
 )
 
 DEPS=(
+    libfontconfig1
+    libglu1-mesa
+    libvulkan-dev
 )
 
 apt-get update
@@ -112,6 +119,13 @@ rm -rf /VK-GL-CTS
 
 . .gitlab-ci/container/build-vulkan-validation.sh
 
+
+############### Build SKQP
+
+if [ "$DEBIAN_ARCH" != "armhf" ]; then
+  . .gitlab-ci/container/build-skqp.sh
+fi
+
 ############### Build nine tests
 
 . .gitlab-ci/container/build-ninetests.sh