diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index d8205920da9..ab34db17726 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -17,7 +17,6 @@
     paths:
       - _build/meson-logs/*.txt
       - _build/meson-logs/strace
-      - shader-db
       - artifacts
 
 # Just Linux
@@ -181,6 +180,7 @@ debian-build-testing:
       -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,lima,panfrost,asahi
       -D b_lto=true
     LLVM_VERSION: 15
+    S3_ARTIFACT_NAME: debian-build-testing
   script: |
     section_start lava-pytest "lava-pytest"
     .gitlab-ci/lava/lava-pytest.sh
@@ -190,9 +190,26 @@ debian-build-testing:
     .gitlab-ci/run-yamllint.sh
     section_switch meson "meson"
     .gitlab-ci/meson/build.sh
+    .gitlab-ci/prepare-artifacts.sh
+  timeout: 15m
+
+shader-db:
+  stage: code-validation
+  extends:
+    - .use-debian/x86_64_build
+  needs:
+    - debian-build-testing
+  variables:
+    S3_ARTIFACT_NAME: debian-build-testing
+  before_script:
+    - !reference [.download_s3, before_script]
+  script: |
     section_switch shader-db "shader-db"
     .gitlab-ci/run-shader-db.sh
-  timeout: 30m
+  artifacts:
+    paths:
+      - shader-db
+  timeout: 15m
 
 # Test a release build with -Werror so new warnings don't sneak in.
 debian-release:
diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index f18c8490876..4d0d65ee72a 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -180,11 +180,7 @@ python-test:
     paths:
       - results/
 
-.baremetal-test:
-  extends:
-    - .test
-  # Cancel job if a newer commit is pushed to the same branch
-  interruptible: true
+.download_s3:
   before_script:
     - !reference [default, before_script]
     # Use this instead of gitlab's artifacts download because it hits packet.net
@@ -196,6 +192,14 @@ python-test:
     - rm -rf install
     - (set -x; curl -L --retry 4 -f --retry-all-errors --retry-delay 60 ${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${S3_ARTIFACT_NAME}.tar.zst | tar --zstd -x)
     - section_end artifacts_download
+
+.baremetal-test:
+  extends:
+    - .test
+  # Cancel job if a newer commit is pushed to the same branch
+  interruptible: true
+  before_script:
+    - !reference [.download_s3, before_script]
   variables:
     BM_ROOTFS: /rootfs-${DEBIAN_ARCH}
   artifacts: