diff --git a/src/freedreno/ci/freedreno-a618-flakes.txt b/src/freedreno/ci/freedreno-a618-flakes.txt
index 5792bb678b4..ee202be5769 100644
--- a/src/freedreno/ci/freedreno-a618-flakes.txt
+++ b/src/freedreno/ci/freedreno-a618-flakes.txt
@@ -25,19 +25,6 @@ dEQP-EGL.functional.color_clears.single_context.gles3.rgb888_pbuffer
 dEQP-EGL.functional.color_clears.single_context.gles3.rgb888_window
 dEQP-EGL.functional.color_clears.single_context.gles3.rgba8888_pbuffer
 dEQP-EGL.functional.color_clears.single_context.gles3.rgba8888_window
-dEQP-EGL.functional.create_context_ext.gl_31.rgba8888_depth_no_stencil
-dEQP-EGL.functional.create_context_ext.gl_32.rgb888_depth_no_stencil
-dEQP-EGL.functional.create_context_ext.gl_32.rgba8888_depth_no_stencil
-dEQP-EGL.functional.create_context_ext.gles_20.rgba8888_depth_stencil
-dEQP-EGL.functional.create_context_ext.gles_30.rgba8888_depth_stencil
-dEQP-EGL.functional.create_context_ext.robust_gl_30.rgb888_depth_stencil
-dEQP-EGL.functional.create_context_ext.robust_gl_30.rgb888_no_depth_no_stencil
-dEQP-EGL.functional.create_context_ext.robust_gl_31.rgb888_depth_no_stencil
-dEQP-EGL.functional.create_context_ext.robust_gl_31.rgba8888_no_depth_no_stencil
-dEQP-EGL.functional.create_context_ext.robust_gl_32.rgb888_no_depth_no_stencil
-dEQP-EGL.functional.create_context_ext.robust_gl_32.rgba8888_no_depth_no_stencil
-dEQP-EGL.functional.create_context_ext.robust_gl_33.rgba8888_depth_no_stencil
-dEQP-EGL.functional.create_context_ext.robust_gles_2_ext.rgb888_no_depth_no_stencil
 dEQP-EGL.functional.render.multi_context.gles2_gles3.rgb888_pbuffer
 dEQP-EGL.functional.render.multi_context.gles2_gles3.rgb888_window
 dEQP-EGL.functional.render.multi_context.gles2_gles3.rgba8888_pbuffer
@@ -75,10 +62,6 @@ dEQP-EGL.functional.sharing.gles2.multithread.random_egl_server_sync.textures.co
 dEQP-EGL.functional.sharing.gles2.multithread.random_egl_sync.textures.copyteximage2d.0
 dEQP-EGL.functional.sharing.gles2.multithread.random.textures.copyteximage2d.16
 dEQP-EGL.functional.sharing.gles2.multithread.simple.buffers.bufferdata
-dEQP-EGL.functional.wide_color.pbuffer_8888_colorspace_srgb
-dEQP-EGL.functional.wide_color.pbuffer_888_colorspace_srgb
-dEQP-EGL.functional.wide_color.window_8888_colorspace_default
-dEQP-EGL.functional.wide_color.window_8888_colorspace_srgb
 
 # Started at least by Jan 2020, current as of May 2021
 dEQP-GLES31.functional.layout_binding.ssbo.fragment_binding_array
diff --git a/src/freedreno/ci/freedreno-a630-flakes.txt b/src/freedreno/ci/freedreno-a630-flakes.txt
index 6900b2f03c6..4861ffcbc25 100644
--- a/src/freedreno/ci/freedreno-a630-flakes.txt
+++ b/src/freedreno/ci/freedreno-a630-flakes.txt
@@ -25,19 +25,6 @@ dEQP-EGL.functional.color_clears.single_context.gles3.rgb888_pbuffer
 dEQP-EGL.functional.color_clears.single_context.gles3.rgb888_window
 dEQP-EGL.functional.color_clears.single_context.gles3.rgba8888_pbuffer
 dEQP-EGL.functional.color_clears.single_context.gles3.rgba8888_window
-dEQP-EGL.functional.create_context_ext.gl_31.rgba8888_depth_no_stencil
-dEQP-EGL.functional.create_context_ext.gl_32.rgb888_depth_no_stencil
-dEQP-EGL.functional.create_context_ext.gl_32.rgba8888_depth_no_stencil
-dEQP-EGL.functional.create_context_ext.gles_20.rgba8888_depth_stencil
-dEQP-EGL.functional.create_context_ext.gles_30.rgba8888_depth_stencil
-dEQP-EGL.functional.create_context_ext.robust_gl_30.rgb888_depth_stencil
-dEQP-EGL.functional.create_context_ext.robust_gl_30.rgb888_no_depth_no_stencil
-dEQP-EGL.functional.create_context_ext.robust_gl_31.rgb888_depth_no_stencil
-dEQP-EGL.functional.create_context_ext.robust_gl_31.rgba8888_no_depth_no_stencil
-dEQP-EGL.functional.create_context_ext.robust_gl_32.rgb888_no_depth_no_stencil
-dEQP-EGL.functional.create_context_ext.robust_gl_32.rgba8888_no_depth_no_stencil
-dEQP-EGL.functional.create_context_ext.robust_gl_33.rgba8888_depth_no_stencil
-dEQP-EGL.functional.create_context_ext.robust_gles_2_ext.rgb888_no_depth_no_stencil
 dEQP-EGL.functional.render.multi_context.gles2_gles3.rgb888_pbuffer
 dEQP-EGL.functional.render.multi_context.gles2_gles3.rgb888_window
 dEQP-EGL.functional.render.multi_context.gles2_gles3.rgba8888_pbuffer
@@ -75,10 +62,6 @@ dEQP-EGL.functional.sharing.gles2.multithread.random_egl_server_sync.textures.co
 dEQP-EGL.functional.sharing.gles2.multithread.random_egl_sync.textures.copyteximage2d.0
 dEQP-EGL.functional.sharing.gles2.multithread.random.textures.copyteximage2d.16
 dEQP-EGL.functional.sharing.gles2.multithread.simple.buffers.bufferdata
-dEQP-EGL.functional.wide_color.pbuffer_8888_colorspace_srgb
-dEQP-EGL.functional.wide_color.pbuffer_888_colorspace_srgb
-dEQP-EGL.functional.wide_color.window_8888_colorspace_default
-dEQP-EGL.functional.wide_color.window_8888_colorspace_srgb
 
 # Started at least by Jan 2020, current as of May 2021
 dEQP-GLES31.functional.layout_binding.ssbo.fragment_binding_array