diff --git a/src/broadcom/ci/deqp-v3dv-rpi4-flakes.txt b/src/broadcom/ci/deqp-v3dv-rpi4-flakes.txt
index f93f310a874..06c98613297 100644
--- a/src/broadcom/ci/deqp-v3dv-rpi4-flakes.txt
+++ b/src/broadcom/ci/deqp-v3dv-rpi4-flakes.txt
@@ -1,2 +1,3 @@
 dEQP-VK.synchronization.op.single_queue.binary_semaphore.write_copy_buffer_read_ssbo_compute_indirect.buffer_16384
+dEQP-VK.synchronization.op.single_queue.binary_semaphore.write_fill_buffer_read_vertex_input.buffer_16384
 dEQP-VK.synchronization.op.single_queue.binary_semaphore.write_update_buffer_read_vertex_input.buffer_16384
diff --git a/src/broadcom/ci/piglit-v3d-rpi4-fails.txt b/src/broadcom/ci/piglit-v3d-rpi4-fails.txt
index 369c161f3fe..7fce21085b7 100644
--- a/src/broadcom/ci/piglit-v3d-rpi4-fails.txt
+++ b/src/broadcom/ci/piglit-v3d-rpi4-fails.txt
@@ -3,7 +3,6 @@ glx@glx-multi-window-single-context,Fail
 glx@glx-multithread-buffer,Fail
 glx@glx-query-drawable-glx_fbconfig_id-window,Fail
 glx@glx-swap-pixmap-bad,Fail
-glx@glx-tfp,Fail
 glx@glx-visuals-depth -pixmap,Crash
 glx@glx-visuals-stencil -pixmap,Crash
 glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail
@@ -29,7 +28,6 @@ spec@!opengl 1.1@depthstencil-default_fb-drawpixels-24_8 samples=2,Fail
 spec@!opengl 1.1@depthstencil-default_fb-drawpixels-32f_24_8_rev samples=2,Fail
 spec@!opengl 1.1@depthstencil-default_fb-drawpixels-32f_24_8_rev samples=4,Fail
 spec@!opengl 1.1@depthstencil-default_fb-drawpixels-float-and-ushort samples=2,Fail
-spec@!opengl 1.1@depthstencil-default_fb-drawpixels-float-and-ushort samples=4,Fail
 spec@!opengl 1.1@getteximage-depth,Fail
 spec@!opengl 1.1@getteximage-formats,Fail
 spec@!opengl 1.1@linestipple,Fail
diff --git a/src/broadcom/ci/piglit-v3d-rpi4-flakes.txt b/src/broadcom/ci/piglit-v3d-rpi4-flakes.txt
index 8a082597e26..18e329c9327 100644
--- a/src/broadcom/ci/piglit-v3d-rpi4-flakes.txt
+++ b/src/broadcom/ci/piglit-v3d-rpi4-flakes.txt
@@ -1,2 +1,3 @@
 glx@glx_arb_sync_control@timing
 spec@!opengl 1.1@depthstencil-default_fb-drawpixels-24_8 samples=4
+spec@!opengl 1.1@depthstencil-default_fb-drawpixels-float-and-ushort samples=4
diff --git a/src/broadcom/ci/piglit-vc4-rpi3-fails.txt b/src/broadcom/ci/piglit-vc4-rpi3-fails.txt
index 1d367ff9c2a..ee6b54d0214 100644
--- a/src/broadcom/ci/piglit-vc4-rpi3-fails.txt
+++ b/src/broadcom/ci/piglit-vc4-rpi3-fails.txt
@@ -9,7 +9,6 @@ glx@glx-multithread-buffer,Fail
 glx@glx-multithread-texture,Timeout
 glx@glx-query-drawable-glx_fbconfig_id-window,Fail
 glx@glx-swap-pixmap-bad,Fail
-glx@glx-tfp,Fail
 glx@glx-visuals-depth -pixmap,Crash
 glx@glx-visuals-depth,Crash
 glx@glx-visuals-stencil -pixmap,Crash
@@ -106,9 +105,6 @@ spec@!opengl 2.1@minmax,Fail
 spec@!opengl 2.1@pbo,Fail
 spec@!opengl 2.1@polygon-stipple-fs,Fail
 spec@!opengl es 2.0@draw_buffers_gles2,Fail
-spec@amd_performance_monitor@api,Crash
-spec@amd_performance_monitor@measure,Crash
-spec@amd_performance_monitor@vc4,Crash
 spec@arb_arrays_of_arrays@execution@glsl-arrays-copy-size-mismatch,Fail
 spec@arb_depth_texture@depth-level-clamp,Fail
 spec@arb_depth_texture@texwrap formats,Fail
@@ -394,6 +390,10 @@ spec@glsl-1.10@execution@samplers@glsl-fs-sampler-numbering-3,Fail
 spec@glsl-1.10@execution@samplers@in-parameter-array,Fail
 spec@glsl-1.10@execution@texture3d,Fail
 spec@glsl-1.20@built-in constants,Fail
+spec@glsl-1.20@execution@fs-nan-builtin-max,Fail
+spec@glsl-1.20@execution@fs-nan-builtin-min,Fail
+spec@glsl-1.20@execution@vs-nan-builtin-max,Fail
+spec@glsl-1.20@execution@vs-nan-builtin-min,Fail
 spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture() 1d,Fail
 spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture() 1dshadow,Fail
 spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture() 2d,Fail