diff --git a/src/broadcom/ci/deqp-broadcom-rpi3.toml b/src/broadcom/ci/deqp-broadcom-rpi3.toml
index 9d74219298e..faeae92ce72 100644
--- a/src/broadcom/ci/deqp-broadcom-rpi3.toml
+++ b/src/broadcom/ci/deqp-broadcom-rpi3.toml
@@ -1,6 +1,9 @@
 [[deqp]]
-deqp = "/deqp/modules/gles2/deqp-gles2"
-caselists = [ "/deqp/mustpass/gles2-master.txt" ]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
+    "/deqp/mustpass/gles2-master.txt",
+    "/deqp/mustpass/gles2-khr-master.txt",
+]
 tests_per_group = 250
 deqp_args = [
     "--deqp-gl-config-name=rgba8888d24s8ms0",
@@ -12,18 +15,6 @@ deqp_args = [
 version_check = "GL ES 2.0.*git"
 renderer_check = "VC4"
 
-[[deqp]]
-deqp = "/deqp/external/openglcts/modules/glcts"
-caselists = [ "/deqp/mustpass/gles2-khr-master.txt" ]
-tests_per_group = 250
-deqp_args = [
-    "--deqp-gl-config-name=rgba8888d24s8ms0",
-    "--deqp-surface-height=256",
-    "--deqp-surface-type=pbuffer",
-    "--deqp-surface-width=256",
-    "--deqp-visibility=hidden",
-]
-
 # We are getting frequent GPU hangs with piglit, but still haven't identified
 # the cause. So let's disable it for now.
 # [[piglit]]
diff --git a/src/broadcom/ci/deqp-broadcom-rpi4.toml b/src/broadcom/ci/deqp-broadcom-rpi4.toml
index 1f8334c49eb..1fe67b427be 100644
--- a/src/broadcom/ci/deqp-broadcom-rpi4.toml
+++ b/src/broadcom/ci/deqp-broadcom-rpi4.toml
@@ -1,41 +1,9 @@
-[[deqp]]
-deqp = "/deqp/modules/gles31/deqp-gles31"
-caselists = [ "/deqp/mustpass/gles31-master.txt" ]
-deqp_args = [
-    "--deqp-gl-config-name=rgba8888d24s8ms0",
-    "--deqp-surface-height=256",
-    "--deqp-surface-type=pbuffer",
-    "--deqp-surface-width=256",
-    "--deqp-visibility=hidden",
-]
-version_check = "GL ES 3.1.*git"
-renderer_check = "V3D"
-
-[[deqp]]
-deqp = "/deqp/modules/gles3/deqp-gles3"
-caselists = [ "/deqp/mustpass/gles3-master.txt" ]
-deqp_args = [
-    "--deqp-gl-config-name=rgba8888d24s8ms0",
-    "--deqp-surface-height=256",
-    "--deqp-surface-type=pbuffer",
-    "--deqp-surface-width=256",
-    "--deqp-visibility=hidden",
-]
-
-[[deqp]]
-deqp = "/deqp/modules/gles2/deqp-gles2"
-caselists = [ "/deqp/mustpass/gles2-master.txt" ]
-deqp_args = [
-    "--deqp-gl-config-name=rgba8888d24s8ms0",
-    "--deqp-surface-height=256",
-    "--deqp-surface-type=pbuffer",
-    "--deqp-surface-width=256",
-    "--deqp-visibility=hidden",
-]
-
 [[deqp]]
 deqp = "/deqp/external/openglcts/modules/glcts"
 caselists = [
+    "/deqp/mustpass/gles31-master.txt",
+    "/deqp/mustpass/gles3-master.txt",
+    "/deqp/mustpass/gles2-master.txt",
     "/deqp/mustpass/gles31-khr-master.txt",
     "/deqp/mustpass/gles3-khr-master.txt",
     "/deqp/mustpass/gles2-khr-master.txt",
@@ -47,6 +15,8 @@ deqp_args = [
     "--deqp-surface-width=256",
     "--deqp-visibility=hidden",
 ]
+version_check = "GL ES 3.1.*git"
+renderer_check = "V3D"
 
 [[piglit]]
 piglit_folder = "/piglit"