diff --git a/src/panfrost/ci/panfrost-g720-flakes.txt b/src/panfrost/ci/panfrost-g720-flakes.txt
index 81b74450850..627385970de 100644
--- a/src/panfrost/ci/panfrost-g720-flakes.txt
+++ b/src/panfrost/ci/panfrost-g720-flakes.txt
@@ -213,11 +213,3 @@ dEQP-VK.wsi.*.swapchain.simulate_oom.*
 
 # With linux kernel 6.13-rc4 uprev
 dEQP-GLES31.functional.copy_image.compressed.viewclass_astc_8x6_rgba.rgba_astc_8x6_khr_srgb8_alpha8_astc_8x6_khr.texture3d_to_cubemap
-
-# Some of these fail almost every nightly CI job
-dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_bgra_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgb565_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgb5_a1_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgba4_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.shared_colorbuffer.tex2d_bgra_depth_component16,Fail
-dEQP-GLES2.functional.fbo.render.shared_colorbuffer.tex2d_rgb_depth_component16,Fail
diff --git a/src/panfrost/ci/panfrost-t720-flakes.txt b/src/panfrost/ci/panfrost-t720-flakes.txt
index 5c89ebd8623..34409bae41d 100644
--- a/src/panfrost/ci/panfrost-t720-flakes.txt
+++ b/src/panfrost/ci/panfrost-t720-flakes.txt
@@ -2,3 +2,11 @@ dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_src_colo
 dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.subtract_src_alpha_constant_alpha
 dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.dst.one_minus_src_color_dst_alpha
 dEQP-GLES2.functional.fragment_ops.random.49
+
+# Some of these fail almost every nightly CI job
+dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_bgra_depth_component16,Fail
+dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgb565_depth_component16,Fail
+dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgb5_a1_depth_component16,Fail
+dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgba4_depth_component16,Fail
+dEQP-GLES2.functional.fbo.render.shared_colorbuffer.tex2d_bgra_depth_component16,Fail
+dEQP-GLES2.functional.fbo.render.shared_colorbuffer.tex2d_rgb_depth_component16,Fail