diff --git a/src/panfrost/ci/panfrost-g52-flakes.txt b/src/panfrost/ci/panfrost-g52-flakes.txt
index 645f910a115..7a300644b09 100644
--- a/src/panfrost/ci/panfrost-g52-flakes.txt
+++ b/src/panfrost/ci/panfrost-g52-flakes.txt
@@ -46,9 +46,6 @@ dEQP-VK.memory.pipeline_barrier.host_write_index_buffer.1048576
 # Sometime timeout
 dEQP-VK.memory.pipeline_barrier.host_write_storage_buffer.1048576
 
-# CTS bug, see https://github.com/KhronosGroup/VK-GL-CTS/commit/3871f1a1c1e5fa479baea4a82ecdd36c30cd7bc0
-dEQP-VK.renderpass2.depth_stencil_resolve.*_samplemask
-
 # The simulate_oom WSI tests are broken in CI
 dEQP-VK.wsi.*.swapchain.simulate_oom.*
 
diff --git a/src/panfrost/ci/panfrost-g610-flakes.txt b/src/panfrost/ci/panfrost-g610-flakes.txt
index bfc5509094f..68520f82af3 100644
--- a/src/panfrost/ci/panfrost-g610-flakes.txt
+++ b/src/panfrost/ci/panfrost-g610-flakes.txt
@@ -1,57 +1,3 @@
-# CTS bug see https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/5479
-dEQP-VK.multiview.masks.no_queries.15_15_15_15
-dEQP-VK.multiview.input_attachments.no_queries.15_15_15_15
-dEQP-VK.multiview.instanced.no_queries.15_15_15_15
-dEQP-VK.multiview.draw_indirect.no_queries.15_15_15_15
-dEQP-VK.multiview.draw_indirect_indexed.no_queries.15_15_15_15
-dEQP-VK.multiview.draw_indexed.no_queries.15_15_15_15
-dEQP-VK.multiview.secondary_cmd_buffer.no_queries.15_15_15_15
-dEQP-VK.multiview.point_size.no_queries.15_15_15_15
-dEQP-VK.multiview.readback_implicit_clear.no_queries.15_15_15_15
-dEQP-VK.multiview.readback_implicit_clear.no_queries.5_10_5_10
-dEQP-VK.multiview.readback_explicit_clear.no_queries.15_15_15_15
-dEQP-VK.multiview.readback_explicit_clear.no_queries.5_10_5_10
-dEQP-VK.multiview.depth.no_queries.3_6_12_9_6_12_9_3_6_12_9_3
-dEQP-VK.multiview.depth_without_fragment_shader.no_queries.3_6_12_9_6_12_9_3_6_12_9_3
-dEQP-VK.multiview.stencil.no_queries.3_6_12_9_6_12_9_3_6_12_9_3
-dEQP-VK.multiview.index.vertex_shader.no_queries.15_15_15_15
-dEQP-VK.multiview.index.fragment_shader.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.masks.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.input_attachments.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.instanced.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.draw_indirect.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.draw_indirect_indexed.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.draw_indexed.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.secondary_cmd_buffer.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.point_size.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.readback_implicit_clear.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.readback_implicit_clear.no_queries.5_10_5_10
-dEQP-VK.multiview.renderpass2.readback_explicit_clear.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.readback_explicit_clear.no_queries.5_10_5_10
-dEQP-VK.multiview.renderpass2.depth.no_queries.3_6_12_9_6_12_9_3_6_12_9_3
-dEQP-VK.multiview.renderpass2.depth_without_fragment_shader.no_queries.3_6_12_9_6_12_9_3_6_12_9_3
-dEQP-VK.multiview.renderpass2.stencil.no_queries.3_6_12_9_6_12_9_3_6_12_9_3
-dEQP-VK.multiview.renderpass2.index.vertex_shader.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.index.fragment_shader.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.masks.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.instanced.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.draw_indirect.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.draw_indirect_indexed.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.draw_indexed.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.secondary_cmd_buffer.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.point_size.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.point_size.no_queries.5_10_5_10
-dEQP-VK.multiview.dynamic_rendering.readback_implicit_clear.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.readback_implicit_clear.no_queries.5_10_5_10
-dEQP-VK.multiview.dynamic_rendering.readback_explicit_clear.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.readback_explicit_clear.no_queries.5_10_5_10
-dEQP-VK.multiview.dynamic_rendering.depth.no_queries.3_6_12_9_6_12_9_3_6_12_9_3
-dEQP-VK.multiview.dynamic_rendering.depth_without_fragment_shader.no_queries.3_6_12_9_6_12_9_3_6_12_9_3
-dEQP-VK.multiview.dynamic_rendering.stencil.no_queries.3_6_12_9_6_12_9_3_6_12_9_3
-dEQP-VK.multiview.dynamic_rendering.index.vertex_shader.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.index.fragment_shader.no_queries.15_15_15_15
-
-
 # Cause a "gpu sched timeout" (fixed by sched increase to 10s)
 dEQP-VK.memory.pipeline_barrier.host_write_uniform_buffer.1048576
 dEQP-VK.memory.pipeline_barrier.host_write_uniform_texel_buffer.1048576
@@ -227,9 +173,6 @@ dEQP-VK.renderpass.suballocation.formats.r32_sint.input.load.store.clear_draw_us
 dEQP-VK.renderpass.suballocation.formats.r32g32_uint.input.load.dont_care.draw_use_input_aspect
 dEQP-VK.renderpass.suballocation.subpass_dependencies.external_subpass.render_size_64_64.render_passes_2
 
-# CTS bug, see https://github.com/KhronosGroup/VK-GL-CTS/commit/3871f1a1c1e5fa479baea4a82ecdd36c30cd7bc0
-dEQP-VK.renderpass2.depth_stencil_resolve.*_samplemask
-
 dEQP-VK.renderpass2.suballocation.formats.a8b8g8r8_sint_pack32.input.load.dont_care.draw
 dEQP-VK.renderpass2.suballocation.formats.a8b8g8r8_srgb_pack32.input.load.store.clear_draw
 
diff --git a/src/panfrost/ci/panfrost-g720-flakes.txt b/src/panfrost/ci/panfrost-g720-flakes.txt
index e66252102dc..f9fb9a365ee 100644
--- a/src/panfrost/ci/panfrost-g720-flakes.txt
+++ b/src/panfrost/ci/panfrost-g720-flakes.txt
@@ -1,57 +1,3 @@
-# CTS bug see https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/5479
-dEQP-VK.multiview.masks.no_queries.15_15_15_15
-dEQP-VK.multiview.input_attachments.no_queries.15_15_15_15
-dEQP-VK.multiview.instanced.no_queries.15_15_15_15
-dEQP-VK.multiview.draw_indirect.no_queries.15_15_15_15
-dEQP-VK.multiview.draw_indirect_indexed.no_queries.15_15_15_15
-dEQP-VK.multiview.draw_indexed.no_queries.15_15_15_15
-dEQP-VK.multiview.secondary_cmd_buffer.no_queries.15_15_15_15
-dEQP-VK.multiview.point_size.no_queries.15_15_15_15
-dEQP-VK.multiview.readback_implicit_clear.no_queries.15_15_15_15
-dEQP-VK.multiview.readback_implicit_clear.no_queries.5_10_5_10
-dEQP-VK.multiview.readback_explicit_clear.no_queries.15_15_15_15
-dEQP-VK.multiview.readback_explicit_clear.no_queries.5_10_5_10
-dEQP-VK.multiview.depth.no_queries.3_6_12_9_6_12_9_3_6_12_9_3
-dEQP-VK.multiview.depth_without_fragment_shader.no_queries.3_6_12_9_6_12_9_3_6_12_9_3
-dEQP-VK.multiview.stencil.no_queries.3_6_12_9_6_12_9_3_6_12_9_3
-dEQP-VK.multiview.index.vertex_shader.no_queries.15_15_15_15
-dEQP-VK.multiview.index.fragment_shader.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.masks.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.input_attachments.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.instanced.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.draw_indirect.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.draw_indirect_indexed.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.draw_indexed.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.secondary_cmd_buffer.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.point_size.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.readback_implicit_clear.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.readback_implicit_clear.no_queries.5_10_5_10
-dEQP-VK.multiview.renderpass2.readback_explicit_clear.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.readback_explicit_clear.no_queries.5_10_5_10
-dEQP-VK.multiview.renderpass2.depth.no_queries.3_6_12_9_6_12_9_3_6_12_9_3
-dEQP-VK.multiview.renderpass2.depth_without_fragment_shader.no_queries.3_6_12_9_6_12_9_3_6_12_9_3
-dEQP-VK.multiview.renderpass2.stencil.no_queries.3_6_12_9_6_12_9_3_6_12_9_3
-dEQP-VK.multiview.renderpass2.index.vertex_shader.no_queries.15_15_15_15
-dEQP-VK.multiview.renderpass2.index.fragment_shader.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.masks.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.instanced.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.draw_indirect.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.draw_indirect_indexed.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.draw_indexed.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.secondary_cmd_buffer.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.point_size.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.point_size.no_queries.5_10_5_10
-dEQP-VK.multiview.dynamic_rendering.readback_implicit_clear.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.readback_implicit_clear.no_queries.5_10_5_10
-dEQP-VK.multiview.dynamic_rendering.readback_explicit_clear.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.readback_explicit_clear.no_queries.5_10_5_10
-dEQP-VK.multiview.dynamic_rendering.depth.no_queries.3_6_12_9_6_12_9_3_6_12_9_3
-dEQP-VK.multiview.dynamic_rendering.depth_without_fragment_shader.no_queries.3_6_12_9_6_12_9_3_6_12_9_3
-dEQP-VK.multiview.dynamic_rendering.stencil.no_queries.3_6_12_9_6_12_9_3_6_12_9_3
-dEQP-VK.multiview.dynamic_rendering.index.vertex_shader.no_queries.15_15_15_15
-dEQP-VK.multiview.dynamic_rendering.index.fragment_shader.no_queries.15_15_15_15
-
-
 # Cause a "gpu sched timeout" (fixed by sched increase to 10s)
 dEQP-VK.memory.pipeline_barrier.host_write_uniform_buffer.1048576
 dEQP-VK.memory.pipeline_barrier.host_write_uniform_texel_buffer.1048576