diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index 1960a826f58..46f6a41b110 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -105,11 +105,11 @@ debian-testing:
       -D glx=dri
       -D platforms=x11,wayland
     GALLIUM_ST: >
-      -D gallium-nine=true
+      -D gallium-nine=false
       -D gallium-rusticl=true
       -D gallium-va=enabled
-    GALLIUM_DRIVERS: "llvmpipe,softpipe,virgl,radeonsi,zink,iris,r300,svga"
-    VULKAN_DRIVERS: "swrast,amd,intel,virtio,nouveau"
+    GALLIUM_DRIVERS: "llvmpipe,softpipe,virgl,radeonsi,zink,iris,svga"
+    VULKAN_DRIVERS: "swrast,amd,intel,virtio"
     BUILDTYPE: "debugoptimized"
     EXTRA_OPTION: >
       -D intel-elk=false
@@ -251,10 +251,11 @@ debian-build-testing:
       -D gallium-vdpau=enabled
       -D gallium-va=enabled
       -D gallium-xa=enabled
-      -D gallium-nine=false
+      -D gallium-nine=true
       -D gallium-rusticl=false
     GALLIUM_DRIVERS: "i915,iris,nouveau,r300,r600,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus"
-    VULKAN_DRIVERS: "swrast,intel_hasvk,imagination-experimental,microsoft-experimental"
+    VULKAN_DRIVERS: "intel_hasvk,imagination-experimental,microsoft-experimental,nouveau,swrast"
+    BUILD_TYPE: "debugoptimized"
     EXTRA_OPTION: >
       -D spirv-to-dxil=true
       -D osmesa=true
diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 680be65f7ff..4c31c058362 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -421,6 +421,15 @@ yaml-toml-shell-py-test:
     - debian-testing
     - !reference [.required-for-hardware-jobs, needs]
 
+.b2c-x86_64-test-vk-manual:
+  extends:
+    - .use-debian/x86_64_test-vk
+    - .b2c-x86_64-test
+  needs:
+    - debian/x86_64_test-vk
+    - debian-build-testing
+    - !reference [.required-for-hardware-jobs, needs]
+
 .b2c-x86_64-test-gl:
   extends:
     - .use-debian/x86_64_test-gl
@@ -430,6 +439,15 @@ yaml-toml-shell-py-test:
     - debian-testing
     - !reference [.required-for-hardware-jobs, needs]
 
+.b2c-x86_64-test-gl-manual:
+  extends:
+    - .use-debian/x86_64_test-gl
+    - .b2c-x86_64-test
+  needs:
+    - debian/x86_64_test-gl
+    - debian-build-testing
+    - !reference [.required-for-hardware-jobs, needs]
+
 .b2c-arm64-test:
   extends:
     - .b2c-test
diff --git a/src/gallium/drivers/r300/ci/gitlab-ci.yml b/src/gallium/drivers/r300/ci/gitlab-ci.yml
index d4e4bce2716..8815dacbed5 100644
--- a/src/gallium/drivers/r300/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/r300/ci/gitlab-ci.yml
@@ -3,7 +3,7 @@ include:
 
 .ondracka-generic:
   extends:
-    - .b2c-x86_64-test-gl
+    - .b2c-x86_64-test-gl-manual # use debian-build-testing rather than debian-testing
     - .r300-manual-rules
   variables:
     FDO_CI_CONCURRENT: 2
diff --git a/src/nouveau/ci/gitlab-ci.yml b/src/nouveau/ci/gitlab-ci.yml
index 72c951d4951..5bad5bcebbc 100644
--- a/src/nouveau/ci/gitlab-ci.yml
+++ b/src/nouveau/ci/gitlab-ci.yml
@@ -3,7 +3,7 @@ include:
 
 nvk-ga106-vkcts-valve:
   extends:
-    - .b2c-x86_64-test-vk
+    - .b2c-x86_64-test-vk-manual
     - .nvk-vkcts
     - .nvk-ga106-valve
     - .nvk-valve-manual-rules
@@ -14,7 +14,7 @@ nvk-ga106-vkcts-valve:
 
 nvk-ga106-vkd3d-valve:
   extends:
-    - .b2c-x86_64-test-vk
+    - .b2c-x86_64-test-vk-manual
     - .nvk-vkcts
     - .nvk-ga106-valve
     - .nvk-valve-manual-rules