diff --git a/src/broadcom/ci/broadcom-rpi3-flakes.txt b/src/broadcom/ci/broadcom-rpi3-flakes.txt
index 895a2f767e2..8d4a91616a5 100644
--- a/src/broadcom/ci/broadcom-rpi3-flakes.txt
+++ b/src/broadcom/ci/broadcom-rpi3-flakes.txt
@@ -3,30 +3,6 @@ dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_and_pos_x_a
 dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_and_pos_x_neg_y_pos_z_and_neg_x_pos_y_neg_z
 dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_pos_x_and_neg_x_neg_y_pos_z_and_neg_x_pos_y_neg_z
 dEQP-GLES2.functional.draw.random.51
-dEQP-GLES2.functional.fragment_ops.blend.rgb_func_alpha_func.src.one_minus_src_alpha_constant_color
-dEQP-GLES2.functional.shaders.indexing.vector_subscript.vec4_direct_write_dynamic_loop_subscript_read_vertex
-dEQP-GLES2.functional.shaders.loops.do_while_dynamic_iterations.basic_mediump_int_vertex
-dEQP-GLES2.functional.shaders.loops.do_while_dynamic_iterations.conditional_continue_vertex
-dEQP-GLES2.functional.shaders.loops.do_while_dynamic_iterations.function_call_inout_vertex
-dEQP-GLES2.functional.shaders.loops.do_while_dynamic_iterations.function_call_return_vertex
-dEQP-GLES2.functional.shaders.loops.do_while_dynamic_iterations.nested_sequence_vertex
-dEQP-GLES2.functional.shaders.loops.while_constant_iterations.select_iteration_count_vertex
-dEQP-GLES2.functional.shaders.loops.while_dynamic_iterations.function_call_return_vertex
-dEQP-GLES2.functional.shaders.loops.while_dynamic_iterations.infinite_with_conditional_break_vertex
-dEQP-GLES2.functional.shaders.loops.while_dynamic_iterations.post_increment_vertex
-dEQP-GLES2.functional.shaders.loops.while_dynamic_iterations.single_iteration_vertex
-dEQP-GLES2.functional.shaders.operator.unary_operator.pre_decrement_result.mediump_vec3_fragment
-dEQP-GLES2.functional.shaders.random.exponential.fragment.51
-dEQP-GLES2.functional.shaders.random.texture.fragment.129
-dEQP-GLES2.functional.shaders.return.output_write_in_func_never_vertex
-dEQP-GLES2.functional.texture.filtering.2d.linear_linear_clamp_rgb888_pot
-dEQP-GLES2.functional.texture.filtering.cube.linear_mipmap_linear_nearest_mirror_rgba8888
-dEQP-GLES2.functional.texture.filtering.cube.nearest_linear_mirror_rgba8888_pot
-dEQP-GLES2.functional.texture.filtering.cube.nearest_mipmap_linear_linear_clamp_rgba8888
-dEQP-GLES2.functional.texture.filtering.cube.nearest_mipmap_linear_nearest_repeat_l8
-dEQP-GLES2.functional.texture.filtering.cube.nearest_mipmap_nearest_linear_clamp_rgba8888
-dEQP-GLES2.functional.texture.filtering.cube.nearest_mipmap_nearest_linear_mirror_rgba8888
-dEQP-GLES2.functional.texture.mipmap.cube.generate.rgb565_fastest
 dEQP-GLES2.functional.texture.size.cube.256x256_rgb888
 
 glx@glx-multi-window-single-context
diff --git a/src/broadcom/ci/broadcom-rpi4-flakes.txt b/src/broadcom/ci/broadcom-rpi4-flakes.txt
index 47578f6ed5e..aefc296bff1 100644
--- a/src/broadcom/ci/broadcom-rpi4-flakes.txt
+++ b/src/broadcom/ci/broadcom-rpi4-flakes.txt
@@ -1,5 +1,3 @@
-dEQP-GLES31.functional.compute.shared_var.basic_type.ivec3_highp
-dEQP-GLES31.functional.ssbo.layout.single_basic_type.packed.highp_mat2
 KHR-GLES31.core.shader_image_load_store.basic-glsl-earlyFragTests
 
 glx@glx_arb_sync_control@swapbuffersmsc-divisor-zero
@@ -12,6 +10,3 @@ spec@egl_chromium_sync_control@conformance
 
 dEQP-VK.api.external.fence.opaque_fd.reset_permanent
 dEQP-VK.api.external.fence.opaque_fd.reset_temporary
-dEQP-VK.api.external.fence.opaque_fd.signal_export_import_wait_permanent
-dEQP-VK.ssbo.layout.instance_array_basic_type.std430.uvec4
-dEQP-VK.wsi.display.get_display_plane_capabilities