diff --git a/src/freedreno/ci/deqp-freedreno-a630-flakes.txt b/src/freedreno/ci/deqp-freedreno-a630-flakes.txt
index dbbca4562bb..aeb26d9ddc5 100644
--- a/src/freedreno/ci/deqp-freedreno-a630-flakes.txt
+++ b/src/freedreno/ci/deqp-freedreno-a630-flakes.txt
@@ -8,10 +8,13 @@ dEQP-EGL.functional.color_clears.multi_context.gles2.rgb888_window
 dEQP-EGL.functional.color_clears.multi_context.gles2.rgba8888_pbuffer
 dEQP-EGL.functional.color_clears.multi_context.gles2.rgba8888_window
 dEQP-EGL.functional.color_clears.multi_context.gles3.rgb888_pbuffer
+dEQP-EGL.functional.color_clears.multi_context.gles3.rgb888_window
 dEQP-EGL.functional.color_clears.multi_context.gles3.rgba8888_pbuffer
+dEQP-EGL.functional.color_clears.multi_context.gles3.rgba8888_window
 dEQP-EGL.functional.color_clears.multi_thread.gles2.rgba8888_pbuffer
 dEQP-EGL.functional.color_clears.multi_thread.gles2.rgba8888_window
 dEQP-EGL.functional.color_clears.multi_thread.gles3.rgb888_pbuffer
+dEQP-EGL.functional.color_clears.multi_thread.gles3.rgb888_window
 dEQP-EGL.functional.color_clears.multi_thread.gles3.rgba8888_pbuffer
 dEQP-EGL.functional.color_clears.multi_thread.gles3.rgba8888_window
 dEQP-EGL.functional.color_clears.single_context.gles2.rgb888_pbuffer
@@ -38,26 +41,33 @@ dEQP-EGL.functional.create_context_ext.robust_gles_2_ext.rgb888_no_depth_no_sten
 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
+dEQP-EGL.functional.render.multi_context.gles2_gles3.rgba8888_window
 dEQP-EGL.functional.render.multi_context.gles2.rgb888_pbuffer
 dEQP-EGL.functional.render.multi_context.gles2.rgb888_window
 dEQP-EGL.functional.render.multi_context.gles2.rgba8888_pbuffer
 dEQP-EGL.functional.render.multi_context.gles2.rgba8888_window
 dEQP-EGL.functional.render.multi_context.gles3.rgb888_pbuffer
 dEQP-EGL.functional.render.multi_context.gles3.rgb888_window
+dEQP-EGL.functional.render.multi_context.gles3.rgba8888_pbuffer
 dEQP-EGL.functional.render.multi_context.gles3.rgba8888_window
 dEQP-EGL.functional.render.multi_thread.gles2_gles3.rgb888_pbuffer
 dEQP-EGL.functional.render.multi_thread.gles2_gles3.rgb888_window
 dEQP-EGL.functional.render.multi_thread.gles2_gles3.rgba8888_pbuffer
 dEQP-EGL.functional.render.multi_thread.gles2_gles3.rgba8888_window
+dEQP-EGL.functional.render.multi_thread.gles2.rgb888_pbuffer
 dEQP-EGL.functional.render.multi_thread.gles2.rgb888_window
 dEQP-EGL.functional.render.multi_thread.gles2.rgba8888_pbuffer
 dEQP-EGL.functional.render.multi_thread.gles2.rgba8888_window
 dEQP-EGL.functional.render.multi_thread.gles3.rgb888_pbuffer
 dEQP-EGL.functional.render.multi_thread.gles3.rgb888_window
 dEQP-EGL.functional.render.multi_thread.gles3.rgba8888_pbuffer
+dEQP-EGL.functional.render.multi_thread.gles3.rgba8888_window
 dEQP-EGL.functional.render.single_context.gles2.rgb888_pbuffer
+dEQP-EGL.functional.render.single_context.gles2.rgb888_window
 dEQP-EGL.functional.render.single_context.gles2.rgba8888_pbuffer
+dEQP-EGL.functional.render.single_context.gles2.rgba8888_window
 dEQP-EGL.functional.render.single_context.gles3.rgb888_pbuffer
+dEQP-EGL.functional.render.single_context.gles3.rgb888_window
 dEQP-EGL.functional.render.single_context.gles3.rgba8888_pbuffer
 dEQP-EGL.functional.render.single_context.gles3.rgba8888_window
 dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.sync_status.vertex