diff --git a/src/etnaviv/ci/deqp-etnaviv-gc2000.toml b/src/etnaviv/ci/deqp-etnaviv-gc2000.toml
new file mode 100644
index 00000000000..3a8cd7cba0c
--- /dev/null
+++ b/src/etnaviv/ci/deqp-etnaviv-gc2000.toml
@@ -0,0 +1,10 @@
+[[deqp]]
+deqp = "/deqp-gles/modules/gles2/deqp-gles2"
+caselists = ["/deqp-gles/mustpass/gles2-main.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+version_check = "GL ES 2.0.*git"
+renderer_check = "GC2000"
diff --git a/src/etnaviv/ci/deqp-etnaviv-gc7000.toml b/src/etnaviv/ci/deqp-etnaviv-gc7000.toml
new file mode 100644
index 00000000000..0b5bc9615d1
--- /dev/null
+++ b/src/etnaviv/ci/deqp-etnaviv-gc7000.toml
@@ -0,0 +1,10 @@
+[[deqp]]
+deqp = "/deqp-gles/modules/gles2/deqp-gles2"
+caselists = ["/deqp-gles/mustpass/gles2-main.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+version_check = "GL ES 2.0.*git"
+renderer_check = "GC7000"
diff --git a/src/etnaviv/ci/gitlab-ci.yml b/src/etnaviv/ci/gitlab-ci.yml
index 0f90a7d7734..0557e08e93b 100644
--- a/src/etnaviv/ci/gitlab-ci.yml
+++ b/src/etnaviv/ci/gitlab-ci.yml
@@ -37,7 +37,6 @@
     BM_CMDLINE: "ip=dhcp console=ttymxc0,115200n8 root=/dev/nfs rw nfsrootdebug init=/init $BM_KERNELARGS"
     BM_DTB: imx6q-cubox-i
     BM_KERNEL: zImage
-    DEQP_EXPECTED_RENDERER: GC2000
     GPU_VERSION: "etnaviv-gc2000"
   script:
     - ./install/bare-metal/fastboot.sh
@@ -50,7 +49,6 @@
     BM_CMDLINE: "ip=dhcp console=ttymxc0,115200n8 root=/dev/nfs rw nfsrootdebug init=/init $BM_KERNELARGS"
     BM_DTB: imx8mq-nitrogen
     BM_KERNEL: Image
-    DEQP_EXPECTED_RENDERER: GC7000
     GPU_VERSION: "etnaviv-gc7000"
   script:
     - ./install/bare-metal/fastboot.sh
@@ -60,13 +58,14 @@
 
 gc2000-gles2:
   extends:
+    - .baremetal-deqp-test
     - .baremetal-test-arm32
     - .austriancoder-imx6q-cubox-i:arm32
     - .etnaviv-manual-rules
   variables:
+    DEQP_SUITE: etnaviv-gc2000
     FLAKES_CHANNEL: "#etnaviv-ci"
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
-    DEQP_VER: gles2
   timeout: 20m
 
 gc2000-gles2-asan:
@@ -90,11 +89,12 @@ gc2000-piglit:
 
 gc7000-gles2:
   extends:
+    - .baremetal-deqp-test
     - .baremetal-test-arm64
     - .austriancoder-imx8mq-nitrogen:arm64
     - .etnaviv-manual-rules
   variables:
+    DEQP_SUITE: etnaviv-gc7000
     FLAKES_CHANNEL: "#etnaviv-ci"
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
-    DEQP_VER: gles2
   timeout: 20m