diff --git a/src/broadcom/ci/broadcom-rpi3-fails.txt b/src/broadcom/ci/broadcom-rpi3-fails.txt
index 620e518140f..dc31a8b52f7 100644
--- a/src/broadcom/ci/broadcom-rpi3-fails.txt
+++ b/src/broadcom/ci/broadcom-rpi3-fails.txt
@@ -7,7 +7,7 @@ KHR-GLES2.core.internalformat.texture2d.depth_component_unsigned_short_depth_com
 #  Creating OpenGL ES 3 context
 # Fail, context: 0x00000000, error: EGL_BAD_MATCH
 # https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/3816
-dEQP-EGL.functional.create_context.no_config,Fail
+x11-dEQP-EGL.functional.create_context.no_config,Fail
 wayland-dEQP-EGL.functional.create_context.no_config,Fail
 
 # wide line outside the viewport incorrectly clipped out when ES wants it
diff --git a/src/broadcom/ci/broadcom-rpi3-flakes.txt b/src/broadcom/ci/broadcom-rpi3-flakes.txt
index 97e67fa8045..03488ae52f2 100644
--- a/src/broadcom/ci/broadcom-rpi3-flakes.txt
+++ b/src/broadcom/ci/broadcom-rpi3-flakes.txt
@@ -26,4 +26,4 @@ spec@!opengl 1.1@copypixels-draw-sync
 spec@!opengl 1.1@draw-copypixels-sync
 
 # 2022-12-29
-dEQP-EGL.functional.color_clears.multi_context.gles2.rgba8888_pbuffer
+x11-dEQP-EGL.functional.color_clears.multi_context.gles2.rgba8888_pbuffer
diff --git a/src/broadcom/ci/deqp-broadcom-rpi3-egl.toml b/src/broadcom/ci/deqp-broadcom-rpi3-egl.toml
index d112b8cdcaa..6b94186e1bd 100644
--- a/src/broadcom/ci/deqp-broadcom-rpi3-egl.toml
+++ b/src/broadcom/ci/deqp-broadcom-rpi3-egl.toml
@@ -7,6 +7,7 @@ deqp_args = [
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
     "--deqp-gl-config-name=rgba8888d24s8ms0",
 ]
+prefix = "x11-"
 
 # Disabled due to timeouts since wayland platform was enabled
 # See https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20480#note_1702748
diff --git a/src/broadcom/ci/deqp-broadcom-rpi4-egl.toml b/src/broadcom/ci/deqp-broadcom-rpi4-egl.toml
index d112b8cdcaa..6b94186e1bd 100644
--- a/src/broadcom/ci/deqp-broadcom-rpi4-egl.toml
+++ b/src/broadcom/ci/deqp-broadcom-rpi4-egl.toml
@@ -7,6 +7,7 @@ deqp_args = [
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
     "--deqp-gl-config-name=rgba8888d24s8ms0",
 ]
+prefix = "x11-"
 
 # Disabled due to timeouts since wayland platform was enabled
 # See https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20480#note_1702748