diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 7f724c86452..2b2499568b0 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -185,8 +185,6 @@
   # depend on more than one image per job. So, the job container is
   # built as part of the CI in the boot2container project.
   image: registry.freedesktop.org/mupuf/valve-infra/mesa-trigger:2022-03-03.2
-  extends:
-    - .use-debian/x86_test-vk
   timeout: 1h 40m
   variables:
     # No need by default to pull the whole repo
@@ -308,9 +306,6 @@
       # Gitlab coordinator for status presentation. results/junit.xml
       # will be parsed by the UI for more detailed explanations of
       # test execution.
-  needs:
-    - debian/x86_test-vk
-    - debian-testing
   artifacts:
     when: always
     name: "mesa_${CI_JOB_NAME}"
@@ -318,3 +313,19 @@
       - ${JOB_FOLDER}/results
     reports:
       junit: ${JOB_FOLDER}/results/junit.xml
+
+.b2c-test-vk:
+  extends:
+    - .use-debian/x86_test-vk
+    - .b2c-test
+  needs:
+    - debian/x86_test-vk
+    - debian-testing
+
+.b2c-test-gl:
+  extends:
+    - .use-debian/x86_test-gl
+    - .b2c-test
+  needs:
+    - debian/x86_test-gl
+    - debian-testing
diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index c4ada155232..7aba5e9060e 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -37,10 +37,15 @@ radv_stoney_vkcts:amd64:
     ACO_DEBUG: validateir,validatera
     MESA_VK_IGNORE_CONFORMANCE_WARNING: 1
 
-.b2c-test-radv:
+.b2c-test-radv-vk:
   extends:
     - .test-radv
-    - .b2c-test
+    - .b2c-test-vk
+
+.b2c-test-radv-gl:
+  extends:
+    - .test-radv
+    - .b2c-test-gl
 
 ############### VKCTS tests ###############
 
@@ -50,7 +55,7 @@ radv_stoney_vkcts:amd64:
 #  So parallel: 2 and DEQP_FRACTION: 5 would imply running 1/10th of the suite.
 .vkcts-test-valve:
   extends:
-    - .b2c-test-radv
+    - .b2c-test-radv-vk
     # Keep all the VKCTS jobs as manual trigger jobs for now, until we
     # have enough resources to meet the throughput requirements for
     # automatic pre-merge in the Mesa CI.