diff --git a/src/freedreno/ci/freedreno-a307-fails.txt b/src/freedreno/ci/freedreno-a307-fails.txt
index 3cf290279f7..98f29c3fdc1 100644
--- a/src/freedreno/ci/freedreno-a307-fails.txt
+++ b/src/freedreno/ci/freedreno-a307-fails.txt
@@ -65,37 +65,6 @@ dEQP-GLES3.functional.fbo.render.shared_colorbuffer.tex2d_r8_depth_rbo_depth24_s
 dEQP-GLES3.functional.fbo.render.shared_colorbuffer.tex2d_r8_depth_stencil_rbo_depth24_stencil8,Fail
 dEQP-GLES3.functional.fbo.render.shared_colorbuffer.tex2d_r8,Fail
 dEQP-GLES3.functional.negative_api.buffer.read_pixels_fbo_format_mismatch,Fail
-dEQP-GLES3.functional.occlusion_query.all_occluders,Fail
-dEQP-GLES3.functional.occlusion_query.depth_clear,Fail
-dEQP-GLES3.functional.occlusion_query.depth_clear_stencil_clear,Fail
-dEQP-GLES3.functional.occlusion_query.depth_clear_stencil_write,Fail
-dEQP-GLES3.functional.occlusion_query.depth_clear_stencil_write_stencil_clear,Fail
-dEQP-GLES3.functional.occlusion_query.depth_write_depth_clear,Fail
-dEQP-GLES3.functional.occlusion_query.depth_write_depth_clear_stencil_clear,Fail
-dEQP-GLES3.functional.occlusion_query.depth_write_depth_clear_stencil_write,Fail
-dEQP-GLES3.functional.occlusion_query.depth_write_depth_clear_stencil_write_stencil_clear,Fail
-dEQP-GLES3.functional.occlusion_query.depth_write,Fail
-dEQP-GLES3.functional.occlusion_query.depth_write_stencil_clear,Fail
-dEQP-GLES3.functional.occlusion_query.depth_write_stencil_write,Fail
-dEQP-GLES3.functional.occlusion_query.depth_write_stencil_write_stencil_clear,Fail
-dEQP-GLES3.functional.occlusion_query.scissor_depth_clear,Fail
-dEQP-GLES3.functional.occlusion_query.scissor_depth_clear_stencil_clear,Fail
-dEQP-GLES3.functional.occlusion_query.scissor_depth_clear_stencil_write,Fail
-dEQP-GLES3.functional.occlusion_query.scissor_depth_clear_stencil_write_stencil_clear,Fail
-dEQP-GLES3.functional.occlusion_query.scissor_depth_write_depth_clear,Fail
-dEQP-GLES3.functional.occlusion_query.scissor_depth_write_depth_clear_stencil_clear,Fail
-dEQP-GLES3.functional.occlusion_query.scissor_depth_write_depth_clear_stencil_write,Fail
-dEQP-GLES3.functional.occlusion_query.scissor_depth_write,Fail
-dEQP-GLES3.functional.occlusion_query.scissor_depth_write_stencil_clear,Fail
-dEQP-GLES3.functional.occlusion_query.scissor_depth_write_stencil_write,Fail
-dEQP-GLES3.functional.occlusion_query.scissor_depth_write_stencil_write_stencil_clear,Fail
-dEQP-GLES3.functional.occlusion_query.scissor,Fail
-dEQP-GLES3.functional.occlusion_query.scissor_stencil_clear,Fail
-dEQP-GLES3.functional.occlusion_query.scissor_stencil_write,Fail
-dEQP-GLES3.functional.occlusion_query.scissor_stencil_write_stencil_clear,Fail
-dEQP-GLES3.functional.occlusion_query.stencil_clear,Fail
-dEQP-GLES3.functional.occlusion_query.stencil_write,Fail
-dEQP-GLES3.functional.occlusion_query.stencil_write_stencil_clear,Fail
 dEQP-GLES3.functional.pbo.renderbuffer.rgb10_a2ui_clears,Fail
 dEQP-GLES3.functional.pbo.renderbuffer.rgb10_a2ui_triangles,Fail
 dEQP-GLES3.functional.polygon_offset.fixed16_displacement_with_units,Fail
diff --git a/src/freedreno/ci/freedreno-a307-flakes.txt b/src/freedreno/ci/freedreno-a307-flakes.txt
index 91d3c510f05..642f591d528 100644
--- a/src/freedreno/ci/freedreno-a307-flakes.txt
+++ b/src/freedreno/ci/freedreno-a307-flakes.txt
@@ -5,6 +5,10 @@ dEQP-GLES3.functional.shaders.texture_functions.texture.*gradoffset.*
 dEQP-GLES3.functional.texture.units.4_units.only_3d.*
 dEQP-GLES3.functional.vertex_arrays.single_attribute.*
 
+# These started UnexpectedPass'ing in an unrelated MR, let's call
+# them flakes for now
+dEQP-GLES3.functional.occlusion_query.*
+
 glx@glx-swap-event_interval
 glx@glx-swap-event_async
 glx@glx_arb_sync_control@swapbuffersmsc-divisor-zero