diff --git a/src/broadcom/ci/broadcom-rpi4-flakes.txt b/src/broadcom/ci/broadcom-rpi4-flakes.txt
index ab16e72b50b..5c6db3ce280 100644
--- a/src/broadcom/ci/broadcom-rpi4-flakes.txt
+++ b/src/broadcom/ci/broadcom-rpi4-flakes.txt
@@ -103,3 +103,26 @@ dEQP-VK.rasterization.primitives_multisample_4_bit.no_stipple.lines
 dEQP-VK.glsl.builtin.function.pack_unpack.unpackunorm4x8_geometry
 
 dEQP-VK.synchronization2.op.single_queue.barrier.write_fill_buffer_read_vertex_input.buffer_262144
+
+dEQP-GLES3.functional.buffer.write.recreate_store.random_4
+dEQP-VK.clipping.clip_volume.inside.triangle_strip
+dEQP-VK.draw.dynamic_rendering.primary_cmd_buff.multi_draw.mosaic.indexed_packed.max_draws.stride_extra_4.10_instances.vert_only.multiview.no_offset_no_draw_id
+dEQP-VK.draw.renderpass.multiple_interpolation.structured.no_sample_decoration.4_samples
+dEQP-VK.memory.mapping.suballocation.full.variable.implicit_unmap		dEQP-VK.rasterization.provoking_vertex.draw.first.triangle_fan
+dEQP-VK.rasterization.culling.front_triangle_strip
+dEQP-VK.rasterization.primitives.no_stipple.rectangular_line_strip_with_adjacency_wide
+dEQP-VK.rasterization.primitives.no_stipple.rectangular_lines_with_adjacency_factor_large
+dEQP-VK.synchronization.implicit.timeline_semaphore.write_copy_buffer_read_copy_buffer.buffer_16384.0112
+dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_copy_buffer_read_vertex_input.buffer_262144_opaque_fd
+dEQP-VK.synchronization2.basic.timeline_semaphore.chain
+dEQP-VK.synchronization2.implicit.timeline_semaphore.write_copy_buffer_read_copy_buffer.buffer_16384.0230
+dEQP-VK.synchronization2.op.single_queue.fence.write_copy_buffer_to_image_read_image_compute.image_128x128_r32g32b32a32_sfloat
+dEQP-VK.synchronization2.timeline_semaphore.device_host.write_copy_buffer_to_image_read_copy_image.image_128x128_d16_unorm
+dEQP-VK.synchronization2.timeline_semaphore.device_host.write_image_compute_indirect_read_blit_image.image_64x64x8_r32_sfloat
+dEQP-VK.synchronization2.implicit.timeline_semaphore.write_copy_buffer_read_copy_buffer.buffer_16384.0232
+dEQP-VK.texture.filtering.2d.combinations.nearest.linear.repeat.clamp_to_edge
+dEQP-VK.texture.filtering.2d.combinations.nearest_mipmap_nearest.linear.clamp_to_border.mirrored_repeat
+dEQP-VK.texture.filtering.2d_array.combinations.linear_mipmap_linear.linear.mirrored_repeat.repeat
+dEQP-VK.texture.filtering.cube.combinations.nearest.linear.mirrored_repeat.repeat.seamless
+spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb cube
+spec@glsl-1.30@execution@tex-miplevel-selection texture(bias) 3d
diff --git a/src/broadcom/ci/broadcom-rpi4-skips.txt b/src/broadcom/ci/broadcom-rpi4-skips.txt
index 112764eee31..d65257c1c83 100644
--- a/src/broadcom/ci/broadcom-rpi4-skips.txt
+++ b/src/broadcom/ci/broadcom-rpi4-skips.txt
@@ -30,16 +30,20 @@ spec@arb_shading_language_420pack@active sampler conflict
 spec@arb_texture_buffer_object@render-no-bo
 
 # Slow CTS tests (> 1 minute to run)
+dEQP-VK.clipping.user_defined.clip_distance.vert_geom.7
 dEQP-VK.image.concurrent_copy.vk_format_r32g32_sfloat.vk_image_tiling_linear.vk_image_type_3d.single.gradient.device.write
 dEQP-VK.image.concurrent_copy.vk_format_r8g8b8a8_unorm.vk_image_tiling_linear.vk_image_type_3d.single.random.device.write
+dEQP-VK.memory.mapping.dedicated_alloc.buffer.full.variable.implicit_unmap
 dEQP-VK.rasterization.culling.back_triangle_fan_reverse
+dEQP-VK.rasterization.primitives.stride_zero.single_point
 dEQP-VK.spirv_assembly.instruction.graphics.spirv_ids_abuse.lots_ids_geom
-dEQP-VK.ssbo.layout.random.8bit.all_per_block_buffers.5
 dEQP-VK.ssbo.layout.random.16bit.all_shared_buffer.31
+dEQP-VK.ssbo.layout.random.8bit.all_per_block_buffers.5
 dEQP-VK.ssbo.layout.random.nested_structs_arrays.17
 dEQP-VK.ssbo.phys.layout.random.8bit.all_per_block_buffers.46
 dEQP-VK.ssbo.phys.layout.random.8bit.nested_structs_arrays.17
 dEQP-VK.ssbo.phys.layout.random.all_shared_buffer.3
+dEQP-VK.synchronization2.basic.timeline_semaphore.chain
 
 # WSI tests are too flaky to be useful
 dEQP-VK.image.swapchain_mutable.*
@@ -124,3 +128,25 @@ dEQP-VK.synchronization2.signal_order.shared_binary_semaphore.write_ssbo_vertex_
 
 # Leaky in VKCTS 1.4.1.1
 asan-dEQP-VK.video.*
+
+# More leaks, pending to investigate
+asan-dEQP-VK.synchronization.cross_instance.suballocated.write_ssbo_compute_indirect_read_ssbo_vertex.buffer_262144_binary_semaphore_fd
+asan-dEQP-VK.synchronization.op.single_queue.event.write_ssbo_compute_indirect_read_vertex_input.buffer_16384
+asan-dEQP-VK.synchronization.op.single_queue.fence.write_draw_indirect_read_image_compute_indirect.image_128x128_r16g16b16a16_uint
+asan-dEQP-VK.synchronization2.cross_instance.dedicated.write_ssbo_compute_indirect_read_ubo_compute.buffer_16384_binary_semaphore_dma_buf
+asan-dEQP-VK.synchronization2.cross_instance.suballocated.write_fill_buffer_read_ubo_compute_indirect.buffer_16384_binary_semaphore_fd
+asan-dEQP-VK.synchronization2.op.single_queue.barrier.write_clear_attachments_read_image_compute_indirect.image_128x128_r8_unorm
+asan-dEQP-VK.synchronization2.op.single_queue.barrier.write_draw_read_image_compute_indirect.image_128x128_r8g8b8a8_unorm
+asan-dEQP-VK.synchronization2.op.single_queue.barrier.write_image_compute_indirect_read_copy_image.image_64x64x8_r32_sfloat
+asan-dEQP-VK.synchronization2.op.single_queue.barrier.write_image_compute_indirect_read_image_compute_indirect.image_64x64x8_r32_sfloat
+asan-dEQP-VK.synchronization2.op.single_queue.barrier.write_image_vertex_read_image_compute_indirect.image_128x128_r16_uint_specialized_access_flag
+asan-dEQP-VK.synchronization2.op.single_queue.binary_semaphore.write_image_compute_indirect_read_image_geometry.image_128x128_r16_uint
+asan-dEQP-VK.synchronization2.op.single_queue.event.write_blit_image_read_image_compute_indirect.image_64x64x8_r32_sfloat_specialized_access_flag
+asan-dEQP-VK.synchronization2.op.single_queue.event.write_image_compute_indirect_read_image_vertex.image_64x64x8_r32_sfloat
+asan-dEQP-VK.synchronization2.op.single_queue.event.write_ssbo_compute_indirect_read_ssbo_fragment.buffer_262144_specialized_access_flag
+asan-dEQP-VK.synchronization2.op.single_queue.event.write_ssbo_compute_indirect_read_ubo_texel_geometry.buffer_16384
+asan-dEQP-VK.synchronization2.op.single_queue.fence.write_copy_image_to_buffer_read_ubo_compute_indirect.buffer_16384
+asan-dEQP-VK.synchronization2.op.single_queue.fence.write_image_compute_indirect_read_image_vertex.image_64x64x8_r32_sfloat_specialized_access_flag
+asan-dEQP-VK.synchronization2.timeline_semaphore.device_host.write_image_compute_indirect_read_image_fragment.image_128x128_r16_uint
+asan-dEQP-VK.synchronization2.timeline_semaphore.one_to_n.write_image_compute_read_image_compute_indirect.image_128x128_r16_uint
+asan-dEQP-VK.synchronization2.timeline_semaphore.wait_before_signal.write_image_compute_read_image_compute_indirect.image_128x128_r16g16b16a16_uint
diff --git a/src/broadcom/ci/broadcom-rpi5-fails.txt b/src/broadcom/ci/broadcom-rpi5-fails.txt
index 056243e7f5c..8d96ffdbbd2 100644
--- a/src/broadcom/ci/broadcom-rpi5-fails.txt
+++ b/src/broadcom/ci/broadcom-rpi5-fails.txt
@@ -443,10 +443,6 @@ program@run kernel with max work item sizes,Fail
 
 # Needs kernel supporting the correct number of performance counters. The fix
 # already landed on drm-misc-next (c606043ddbf0)
-dEQP-VK.query_pool.performance_query.query_compute,Fail
-dEQP-VK.query_pool.performance_query.query_compute_copy,Fail
-dEQP-VK.query_pool.performance_query.query_graphic,Fail
-dEQP-VK.query_pool.performance_query.query_graphic_copy,Fail
 KHR-GL31.transform_feedback3.multiple_streams,Fail
 KHR-GL31.transform_feedback3.skip_components,Fail
 KHR-GL31.transform_feedback3.skip_multiple_buffers,Fail
diff --git a/src/broadcom/ci/broadcom-rpi5-flakes.txt b/src/broadcom/ci/broadcom-rpi5-flakes.txt
index a812ac1569d..d26fa6075eb 100644
--- a/src/broadcom/ci/broadcom-rpi5-flakes.txt
+++ b/src/broadcom/ci/broadcom-rpi5-flakes.txt
@@ -230,3 +230,11 @@ dEQP-VK.texture.shadow.cube.nearest_mipmap_nearest.not_equal_x8_d24_unorm_pack32
 
 # Flaky when running them in parallel, reliable otherwise
 dEQP-VK.synchronization2?.implicit.timeline_semaphore.write_(copy_buffer|ssbo_vertex)_read_(copy_buffer|ssbo_vertex).buffer_16384.*
+
+dEQP-VK.synchronization.implicit.timeline_semaphore.write_copy_buffer_read_copy_buffer.buffer_16384.0312
+dEQP-VK.synchronization2.implicit.timeline_semaphore.write_copy_buffer_read_copy_buffer.buffer_16384.0001
+dEQP-VK.synchronization2.implicit.timeline_semaphore.write_ssbo_vertex_read_copy_buffer.buffer_16384.2220
+dEQP-VK.synchronization2.timeline_semaphore.device_host.write_copy_image_read_image_geometry.image_64x64x8_r32_sfloat
+dEQP-VK.tessellation.shader_input_output.primitive_id_tcs
+dEQP-VK.texture.filtering.2d.combinations.nearest_mipmap_nearest.linear.clamp_to_border.clamp_to_border
+spec@arb_texture_multisample@texelfetch fs sampler2dms 4 1x130-501x130
diff --git a/src/broadcom/ci/broadcom-rpi5-skips.txt b/src/broadcom/ci/broadcom-rpi5-skips.txt
index 4b7ce49e2c4..15146ef5023 100644
--- a/src/broadcom/ci/broadcom-rpi5-skips.txt
+++ b/src/broadcom/ci/broadcom-rpi5-skips.txt
@@ -17,6 +17,7 @@ spec@glsl-es-3.20.*
 # Slow CL tests (> 5 minute to run)
 
 # Slow CTS tests (> 1 minute to run)
+dEQP-VK.rasterization.discard.triangle_strip.query_pipeline_false
 dEQP-VK.spirv_assembly.instruction.graphics.spirv_ids_abuse.lots_ids_geom
 dEQP-VK.ssbo.layout.random.8bit.all_per_block_buffers.5
 dEQP-VK.ssbo.layout.random.8bit.scalar.78
@@ -52,6 +53,7 @@ dEQP-VK.ssbo.phys.layout.unsized_struct_array.single_buffer.scalar_instance_arra
 dEQP-VK.ssbo.phys.layout.unsized_struct_array.single_buffer.scalar_instance_array_comp_access
 dEQP-VK.ssbo.phys.layout.unsized_struct_array.single_buffer.scalar_instance_array_comp_access_store_cols
 dEQP-VK.ssbo.phys.layout.unsized_struct_array.single_buffer.scalar_instance_array_store_cols
+dEQP-VK.synchronization2.timeline_semaphore.device_host.write_copy_buffer_to_image_read_copy_image_to_buffer.image_128x128_r16_uint
 
 # WSI tests are too flaky to be useful
 dEQP-VK.image.swapchain_mutable.*