diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index 0b7a631aa04..c0fc61c50b2 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -46,6 +46,72 @@ radv_stoney_vkcts:amd64:
   extends:
     - .test-radv
     - .b2c-test-gl
+  variables:
+    MESA_LOADER_DRIVER_OVERRIDE: zink
+
+.deqp-test-valve:
+  extends:
+    # Keep all the dEQP 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.
+    - .test-manual-mr
+  variables:
+    B2C_JOB_SUCCESS_REGEX: '^\+ DEQP_EXITCODE=0\r$'
+    B2C_TEST_SCRIPT: ./install/deqp-runner.sh
+    B2C_JOB_VOLUME_EXCLUSIONS: "*.shader_cache"
+
+.polaris10-test-valve:
+  variables:
+    FDO_CI_CONCURRENT: 16
+    B2C_TIMEOUT_BOOT_RETRIES: 4
+    # (2022-01) tsc=unstable was added in response to this message in kmsg,
+    #    TSC found unstable after boot, most likely due to broken BIOS. Use 'tsc=unstable'.
+    B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g tsc=unstable'
+  tags:
+    - amdgpu:codename:POLARIS10
+
+.vega10-test-valve:
+  variables:
+    FDO_CI_CONCURRENT: 16
+    B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g'
+  tags:
+    - amdgpu:codename:VEGA10
+
+.renoir-test-valve:
+  variables:
+    FDO_CI_CONCURRENT: 24
+    B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g'
+    B2C_TIMEOUT_BOOT_MINUTES: 60
+    B2C_TIMEOUT_OVERALL_MINUTES: 120
+  tags:
+    - amdgpu:codename:RENOIR
+
+.navi10-test-valve:
+  variables:
+    FDO_CI_CONCURRENT: 24
+    # (2022-01) noapic is set because the serial adapter on this
+    # machine is using non-MSI IRQs and is generating a lot of
+    # IRQs. This tends to confuse the interrupt controller and breaks
+    # MSI IRQs leading to GPU hangs on amdgpu.
+    B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g noapic'
+  tags:
+    - amdgpu:codename:NAVI10
+
+.navi21-test-valve:
+  variables:
+    FDO_CI_CONCURRENT: 16
+    B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g'
+  tags:
+    - amdgpu:codename:NAVI21
+
+.vangogh-test-valve:
+  variables:
+    FDO_CI_CONCURRENT: 8
+    B2C_TIMEOUT_BOOT_MINUTES: 85
+    B2C_TIMEOUT_OVERALL_MINUTES: 120
+    B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g'
+  tags:
+    - amdgpu:codename:VANGOGH
 
 ############### VKCTS tests ###############
 
@@ -56,14 +122,8 @@ radv_stoney_vkcts:amd64:
 .vkcts-test-valve:
   extends:
     - .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.
-    - .test-manual-mr
+    - .deqp-test-valve
   variables:
-    B2C_JOB_SUCCESS_REGEX: '^\+ DEQP_EXITCODE=0\r$'
-    B2C_TEST_SCRIPT: ./install/deqp-runner.sh
-    B2C_JOB_VOLUME_EXCLUSIONS: "*.shader_cache"
     DEQP_VER: vk
     RADV_PERFTEST: nv_ms
 
@@ -105,132 +165,75 @@ radv_stoney_vkcts:amd64:
 vkcts-polaris10-valve:
   extends:
     - .vkcts-test-valve
+    - .polaris10-test-valve
   variables:
     GPU_VERSION: radv-polaris10-aco
-    FDO_CI_CONCURRENT: 16
-    B2C_TIMEOUT_BOOT_RETRIES: 4
-    # (2022-01) tsc=unstable was added in response to this message in kmsg,
-    #    TSC found unstable after boot, most likely due to broken BIOS. Use 'tsc=unstable'.
-    B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g tsc=unstable'
-  tags:
-    - amdgpu:codename:POLARIS10
 
 vkcts-vega10-valve:
   extends:
     - .vkcts-test-valve
+    - .vega10-test-valve
   variables:
     GPU_VERSION: radv-vega10-aco
-    FDO_CI_CONCURRENT: 16
-    B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g'
-  tags:
-    - amdgpu:codename:VEGA10
 
 vkcts-renoir-valve:
   extends:
     - .vkcts-test-valve
+    - .renoir-test-valve
   timeout: 2h 10m
   variables:
     GPU_VERSION: radv-renoir-aco
-    FDO_CI_CONCURRENT: 24
-    B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g'
-    B2C_TIMEOUT_BOOT_MINUTES: 60
-    B2C_TIMEOUT_OVERALL_MINUTES: 120
-  tags:
-    - amdgpu:codename:RENOIR
 
 vkcts-navi10-valve:
   extends:
     - .vkcts-test-valve
+    - .navi10-test-valve
   variables:
     GPU_VERSION: radv-navi10-aco
-    FDO_CI_CONCURRENT: 24
-    # (2022-01) noapic is set because the serial adapter on this
-    # machine is using non-MSI IRQs and is generating a lot of
-    # IRQs. This tends to confuse the interrupt controller and breaks
-    # MSI IRQs leading to GPU hangs on amdgpu.
-    B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g noapic'
-  tags:
-    - amdgpu:codename:NAVI10
 
 vkcts-navi21-valve:
   extends:
     - .vkcts-test-valve
+    - .navi21-test-valve
   variables:
     GPU_VERSION: radv-navi21-aco
-    FDO_CI_CONCURRENT: 16
-    B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g'
-  tags:
-    - amdgpu:codename:NAVI21
 
 vkcts-vangogh-valve:
   extends:
     - .vkcts-test-valve
+    - .vangogh-test-valve
   timeout: 2h 10m
   variables:
     GPU_VERSION: radv-vangogh-aco
-    FDO_CI_CONCURRENT: 8
-    B2C_TIMEOUT_BOOT_MINUTES: 85
-    B2C_TIMEOUT_OVERALL_MINUTES: 120
-    B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g'
-  tags:
-    - amdgpu:codename:VANGOGH
 
 ############### gles/GLCTS
 .glcts-test-valve:
   extends:
     - .b2c-test-radv-gl
-    # Keep all the GLCTS 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.
-    - .test-manual-mr
+    - .deqp-test-valve
   variables:
-    B2C_JOB_SUCCESS_REGEX: '^\+ DEQP_EXITCODE=0\r$'
-    B2C_TEST_SCRIPT: ./install/deqp-runner.sh
-    B2C_JOB_VOLUME_EXCLUSIONS: "*.shader_cache"
     DEQP_VER: gl46
-    MESA_LOADER_DRIVER_OVERRIDE: zink
 
 glcts-navi10-valve:
   extends:
     - .glcts-test-valve
+    - .navi10-test-valve
   variables:
     GPU_VERSION: zink-radv
-    FDO_CI_CONCURRENT: 24
-    # (2022-01) noapic is set because the serial adapter on this
-    # machine is using non-MSI IRQs and is generating a lot of
-    # IRQs. This tends to confuse the interrupt controller and breaks
-    # MSI IRQs leading to GPU hangs on amdgpu.
-    B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g noapic'
-  tags:
-    - amdgpu:codename:NAVI10
 
 .gles-test-valve:
   extends:
     - .b2c-test-radv-gl
-    # Keep all the GLCTS 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.
-    - .test-manual-mr
+    - .deqp-test-valve
   variables:
-    B2C_JOB_SUCCESS_REGEX: '^\+ DEQP_EXITCODE=0\r$'
-    B2C_TEST_SCRIPT: ./install/deqp-runner.sh
-    B2C_JOB_VOLUME_EXCLUSIONS: "*.shader_cache"
     DEQP_SUITE: zink-radv
-    MESA_LOADER_DRIVER_OVERRIDE: zink
 
 gles-navi10-valve:
   extends:
     - .gles-test-valve
+    - .navi10-test-valve
   variables:
     GPU_VERSION: zink-radv
-    FDO_CI_CONCURRENT: 24
-    # (2022-01) noapic is set because the serial adapter on this
-    # machine is using non-MSI IRQs and is generating a lot of
-    # IRQs. This tends to confuse the interrupt controller and breaks
-    # MSI IRQs leading to GPU hangs on amdgpu.
-    B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g noapic'
-  tags:
-    - amdgpu:codename:NAVI10
 
 ############### Fossilize
 radv-fossils: