diff --git a/src/intel/ci/iris-apl-flakes.txt b/src/intel/ci/iris-apl-flakes.txt
index c5118a8998b..f26d9dce809 100644
--- a/src/intel/ci/iris-apl-flakes.txt
+++ b/src/intel/ci/iris-apl-flakes.txt
@@ -5,22 +5,10 @@ dEQP-EGL.functional.sharing.gles2.multithread.random.images.copyteximage2d.12
 dEQP-EGL.functional.sharing.gles2.multithread.random.images.copytexsubimage2d.1
 
 # Flakes from Mar-May 2022
-dEQP-EGL.functional.color_clears.multi_context.gles2.rgb888_pbuffer
-dEQP-EGL.functional.color_clears.multi_context.gles2.rgba8888_pbuffer
-dEQP-EGL.functional.color_clears.multi_thread.gles2.rgba8888_pbuffer
-dEQP-EGL.functional.color_clears.single_context.gles2.rgb888_pbuffer
-dEQP-EGL.functional.color_clears.single_context.gles2.rgba8888_pbuffer
-dEQP-EGL.functional.color_clears.single_context.gles3.rgb888_pbuffer
-dEQP-EGL.functional.color_clears.single_context.gles3.rgba8888_pbuffer
-dEQP-EGL.functional.render.multi_context.gles2_gles3.rgba8888_pbuffer
-dEQP-EGL.functional.render.multi_context.gles2.rgba8888_pbuffer
-dEQP-EGL.functional.color_clears.multi_context.gles3.rgba8888_pbuffer
-dEQP-EGL.functional.render.multi_thread.gles2.rgba8888_pbuffer
-dEQP-EGL.functional.render.multi_thread.gles3.rgb888_pbuffer
-dEQP-EGL.functional.render.multi_thread.gles3.rgba8888_pbuffer
-dEQP-EGL.functional.render.single_context.gles2.rgba8888_pbuffer
-dEQP-EGL.functional.render.single_context.gles3.rgb888_pbuffer
-dEQP-EGL.functional.render.single_context.gles3.rgba8888_pbuffer
+dEQP-EGL.functional.color_clears.*.rgb888_pbuffer
+dEQP-EGL.functional.color_clears.*.rgba8888_pbuffer
+dEQP-EGL.functional.render.*.rgb888_pbuffer
+dEQP-EGL.functional.render.*.rgba8888_pbuffer
 dEQP-EGL.functional.sharing.gles2.multithread.random_egl_sync.programs.link.7
 dEQP-EGL.functional.sharing.gles2.multithread.random.images.copyteximage2d.19
 dEQP-EGL.functional.sharing.gles2.multithread.random.images.copyteximage2d.6
diff --git a/src/intel/ci/iris-glk-flakes.txt b/src/intel/ci/iris-glk-flakes.txt
index 319ddff4339..a0f959e6143 100644
--- a/src/intel/ci/iris-glk-flakes.txt
+++ b/src/intel/ci/iris-glk-flakes.txt
@@ -9,3 +9,8 @@ dEQP-EGL.functional.sharing.gles2.multithread.random.images.copyteximage2d.1
 dEQP-EGL.functional.sharing.gles2.multithread.random.images.copyteximage2d.4
 dEQP-EGL.functional.sharing.gles2.multithread.random.images.copyteximage2d.12
 dEQP-EGL.functional.sharing.gles2.multithread.random.images.copytexsubimage2d.1
+
+dEQP-EGL.functional.color_clears.*.rgb888_pbuffer
+dEQP-EGL.functional.color_clears.*.rgba8888_pbuffer
+dEQP-EGL.functional.render.*.rgb888_pbuffer
+dEQP-EGL.functional.render.*.rgba8888_pbuffer