diff --git a/.gitlab-ci/container/debian/test-base.sh b/.gitlab-ci/container/debian/test-base.sh
index 414a37f8a60..7507a3405e0 100644
--- a/.gitlab-ci/container/debian/test-base.sh
+++ b/.gitlab-ci/container/debian/test-base.sh
@@ -47,13 +47,27 @@ EPHEMERAL=(
     libegl-dev
     libelf-dev
     libepoxy-dev
+    libexpat1-dev
     libgbm-dev
+    libgles2-mesa-dev
+    liblz4-dev
     libpciaccess-dev
     libssl-dev
     libvulkan-dev
+    libudev-dev
+    libwaffle-dev
     libwayland-dev
     libx11-xcb-dev
+    libxcb-dri2-0-dev
+    libxcb-dri3-dev
+    libxcb-present-dev
+    libxfixes-dev
+    libxcb-ewmh-dev
     libxext-dev
+    libxkbcommon-dev
+    libxrandr-dev
+    libxrender-dev
+    libzstd-dev
     "llvm-${LLVM_VERSION}-dev"
     make
     meson
@@ -190,6 +204,12 @@ fi
 
 . .gitlab-ci/container/build-deqp-runner.sh
 
+############### Build apitrace
+
+uncollapsed_section_switch apitrace "Building apitrace"
+
+. .gitlab-ci/container/build-apitrace.sh
+
 ############### Uninstall the build software
 
 uncollapsed_section_switch debian_cleanup "Cleaning up base Debian system"
diff --git a/.gitlab-ci/container/debian/test-gl.sh b/.gitlab-ci/container/debian/test-gl.sh
index a73a180a1d5..e966ea38e0c 100644
--- a/.gitlab-ci/container/debian/test-gl.sh
+++ b/.gitlab-ci/container/debian/test-gl.sh
@@ -100,10 +100,6 @@ DEQP_TARGET=surfaceless \
 
 rm -rf /VK-GL-CTS
 
-############### Build apitrace
-
-. .gitlab-ci/container/build-apitrace.sh
-
 ############### Build validation layer for zink
 
 . .gitlab-ci/container/build-vulkan-validation.sh
diff --git a/.gitlab-ci/container/debian/test-vk.sh b/.gitlab-ci/container/debian/test-vk.sh
index f36e6ab6972..96497ee78c4 100644
--- a/.gitlab-ci/container/debian/test-vk.sh
+++ b/.gitlab-ci/container/debian/test-vk.sh
@@ -104,10 +104,6 @@ DEQP_TARGET=default \
 
 rm -rf /VK-GL-CTS
 
-############### Build apitrace
-
-. .gitlab-ci/container/build-apitrace.sh
-
 ############### Build Fossilize
 
 . .gitlab-ci/container/build-fossilize.sh