diff --git a/src/freedreno/ci/freedreno-a618-flakes.txt b/src/freedreno/ci/freedreno-a618-flakes.txt
index ee4f0d89e48..8a840733184 100644
--- a/src/freedreno/ci/freedreno-a618-flakes.txt
+++ b/src/freedreno/ci/freedreno-a618-flakes.txt
@@ -241,10 +241,9 @@ dEQP-VK.clipping.user_defined.clip_cull_distance.*geom.*
 dEQP-VK.clipping.user_defined.clip_cull_distance.*tess.*
 dEQP-VK.clipping.user_defined.clip_distance.*geom.*
 dEQP-VK.clipping.user_defined.clip_distance.*tess.*
-dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.multi_draw.mosaic.normal.one_draw.stride_extra_12.1_instance.with_geom.single_view.no_offset_no_draw_id
+dEQP-VK.draw.dynamic_rendering.*multi_draw.*geom.*
+dEQP-VK.draw.dynamic_rendering.*multi_draw.*tess.*
 dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.instanced.dynamic_state_draw_vk_primitive_topology_triangle_strip_attrib_divisor_2
-dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.multi_draw.mosaic.indexed_mixed.16_draws.stride_extra_4.1_instance.tess_geom.single_view.offset_6_no_draw_id
-dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.multi_draw.mosaic.indexed_random.16_draws.stride_extra_4.10_instances.with_tess.single_view.no_offset
 dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.shader_layer.tessellation_shader_4
 dEQP-VK.dynamic_rendering.primary_cmd_buff.random.seed46_geometry
 dEQP-VK.dynamic_rendering.primary_cmd_buff.random.seed88_geometry
@@ -255,10 +254,9 @@ dEQP-VK.fragment_operations.scissor.multi_viewport.*
 dEQP-VK.glsl.builtin.function.integer.bitfieldinsert.uvec3_mediump_geometry
 dEQP-VK.glsl.builtin.function.integer.bitfieldreverse.uint_mediump_geometry
 dEQP-VK.glsl.builtin.function.integer.umulextended.uvec4_highp_tess_eval
-dEQP-VK.pipeline.monolithic.interface_matching.vector_length.out_ivec3_in_ivec3_loose_variable_vert_tesc_tese_out_geom_in_frag
+dEQP-VK.pipeline.*.interface_matching.vector_length.*tesc.*
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.rasterization_stream_none_to_one
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.2_scissors_switch
-dEQP-VK.pipeline.pipeline_library.interface_matching.vector_length.out_ivec3_in_ivec3_member_of_structure_vert_tesc_out_tese_in_frag
 dEQP-VK.renderpass.suballocation.multisample_resolve.layers_6.r32g32b32a32_uint.samples_2_resolve_level_2
 dEQP-VK.renderpass2.suballocation.multisample_resolve.layers_3.r32g32b32a32_sint.samples_4_resolve_level_2
 dEQP-VK.renderpass2.suballocation.multisample_resolve.layers_6.r16g16b16a16_uint.samples_4_resolve_level_3
@@ -269,6 +267,7 @@ dEQP-VK.spirv_assembly.type.*geom.*
 dEQP-VK.spirv_assembly.type.*tess.*
 dEQP-VK.synchronization.*_geometry.*
 dEQP-VK.synchronization.*_tess_ctrl.*
+dEQP-VK.synchronization.*_tess_control.*
 dEQP-VK.synchronization.*_tess_eval.*
 dEQP-VK.tessellation.invariance.*
 
diff --git a/src/freedreno/ci/freedreno-a660-flakes.txt b/src/freedreno/ci/freedreno-a660-flakes.txt
index dc0b41488fb..3d8d1e0fdb5 100644
--- a/src/freedreno/ci/freedreno-a660-flakes.txt
+++ b/src/freedreno/ci/freedreno-a660-flakes.txt
@@ -16,10 +16,9 @@ dEQP-VK.clipping.user_defined.clip_cull_distance.*geom.*
 dEQP-VK.clipping.user_defined.clip_cull_distance.*tess.*
 dEQP-VK.clipping.user_defined.clip_distance.*geom.*
 dEQP-VK.clipping.user_defined.clip_distance.*tess.*
-dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.multi_draw.mosaic.normal.one_draw.stride_extra_12.1_instance.with_geom.single_view.no_offset_no_draw_id
+dEQP-VK.draw.dynamic_rendering.*multi_draw.*geom.*
+dEQP-VK.draw.dynamic_rendering.*multi_draw.*tess.*
 dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.instanced.dynamic_state_draw_vk_primitive_topology_triangle_strip_attrib_divisor_2
-dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.multi_draw.mosaic.indexed_mixed.16_draws.stride_extra_4.1_instance.tess_geom.single_view.offset_6_no_draw_id
-dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.multi_draw.mosaic.indexed_random.16_draws.stride_extra_4.10_instances.with_tess.single_view.no_offset
 dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.shader_layer.tessellation_shader_4
 dEQP-VK.dynamic_rendering.primary_cmd_buff.random.seed46_geometry
 dEQP-VK.dynamic_rendering.primary_cmd_buff.random.seed88_geometry
@@ -30,10 +29,9 @@ dEQP-VK.fragment_operations.scissor.multi_viewport.*
 dEQP-VK.glsl.builtin.function.integer.bitfieldinsert.uvec3_mediump_geometry
 dEQP-VK.glsl.builtin.function.integer.bitfieldreverse.uint_mediump_geometry
 dEQP-VK.glsl.builtin.function.integer.umulextended.uvec4_highp_tess_eval
-dEQP-VK.pipeline.monolithic.interface_matching.vector_length.out_ivec3_in_ivec3_loose_variable_vert_tesc_tese_out_geom_in_frag
+dEQP-VK.pipeline.*.interface_matching.vector_length.*tesc.*
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.rasterization_stream_none_to_one
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.2_scissors_switch
-dEQP-VK.pipeline.pipeline_library.interface_matching.vector_length.out_ivec3_in_ivec3_member_of_structure_vert_tesc_out_tese_in_frag
 dEQP-VK.renderpass.suballocation.multisample_resolve.layers_6.r32g32b32a32_uint.samples_2_resolve_level_2
 dEQP-VK.renderpass2.suballocation.multisample_resolve.layers_3.r32g32b32a32_sint.samples_4_resolve_level_2
 dEQP-VK.renderpass2.suballocation.multisample_resolve.layers_6.r16g16b16a16_uint.samples_4_resolve_level_3
@@ -44,6 +42,7 @@ dEQP-VK.spirv_assembly.type.*geom.*
 dEQP-VK.spirv_assembly.type.*tess.*
 dEQP-VK.synchronization.*_geometry.*
 dEQP-VK.synchronization.*_tess_ctrl.*
+dEQP-VK.synchronization.*_tess_control.*
 dEQP-VK.synchronization.*_tess_eval.*
 dEQP-VK.tessellation.invariance.*