diff --git a/.pick_status.json b/.pick_status.json
index dc66172f4b7..58d4678ec44 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -204,7 +204,7 @@
         "description": "pan/ci: add flaky tests to the flake-list",
         "nominated": true,
         "nomination_type": 4,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/panfrost/ci/panfrost-g52-fails.txt b/src/panfrost/ci/panfrost-g52-fails.txt
index ad190749995..0178b4b706e 100644
--- a/src/panfrost/ci/panfrost-g52-fails.txt
+++ b/src/panfrost/ci/panfrost-g52-fails.txt
@@ -378,37 +378,6 @@ dEQP-VK.api.copy_and_blit.core.resolve_image.copy_with_regions_before_resolving.
 dEQP-VK.api.copy_and_blit.copy_commands2.resolve_image.whole_copy_before_resolving_no_cab.4_bit,Fail
 dEQP-VK.api.copy_and_blit.copy_commands2.resolve_image.copy_with_regions_before_resolving.4_bit,Fail
 
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.clipped,Crash
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.composite_alpha,Crash
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.exclusive_nonzero_queues,Crash
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_array_layers,Crash
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_extent,Crash
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_format,Crash
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_usage,Crash
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.min_image_count,Crash
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.pre_transform,Crash
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.present_mode,Crash
-dEQP-VK.wsi.xlib.swapchain.simulate_oom.clipped,Crash
-dEQP-VK.wsi.xlib.swapchain.simulate_oom.composite_alpha,Crash
-dEQP-VK.wsi.xlib.swapchain.simulate_oom.exclusive_nonzero_queues,Crash
-dEQP-VK.wsi.xlib.swapchain.simulate_oom.image_array_layers,Crash
-dEQP-VK.wsi.xlib.swapchain.simulate_oom.image_extent,Crash
-dEQP-VK.wsi.xlib.swapchain.simulate_oom.image_format,Crash
-dEQP-VK.wsi.xlib.swapchain.simulate_oom.image_usage,Crash
-dEQP-VK.wsi.xlib.swapchain.simulate_oom.min_image_count,Crash
-dEQP-VK.wsi.xlib.swapchain.simulate_oom.pre_transform,Crash
-dEQP-VK.wsi.xlib.swapchain.simulate_oom.present_mode,Crash
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.clipped,Crash
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.composite_alpha,Crash
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.exclusive_nonzero_queues,Crash
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.image_array_layers,Crash
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.image_extent,Crash
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.image_format,Crash
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.image_usage,Crash
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.min_image_count,Crash
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.pre_transform,Crash
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.present_mode,Crash
-
 dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.2_cmdbuffers_resuming,Fail
 dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.2_secondary_2_primary_cmdbuffers_resuming,Fail
 dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.2_secondary_cmdbuffers_resuming,Fail
diff --git a/src/panfrost/ci/panfrost-g52-flakes.txt b/src/panfrost/ci/panfrost-g52-flakes.txt
index 31bd8000eec..617502b5df5 100644
--- a/src/panfrost/ci/panfrost-g52-flakes.txt
+++ b/src/panfrost/ci/panfrost-g52-flakes.txt
@@ -32,3 +32,6 @@ dEQP-VK.memory.pipeline_barrier.host_write_uniform_texel_buffer.1048576
 
 # Sometime timeout
 dEQP-VK.memory.pipeline_barrier.host_write_storage_buffer.1048576
+
+# No clue what's happening to these on CI lately
+dEQP-VK.wsi.*.swapchain.simulate_oom.*
diff --git a/src/panfrost/ci/panfrost-g610-fails.txt b/src/panfrost/ci/panfrost-g610-fails.txt
index 6e391f21ce7..40db5c7b0b7 100644
--- a/src/panfrost/ci/panfrost-g610-fails.txt
+++ b/src/panfrost/ci/panfrost-g610-fails.txt
@@ -7,31 +7,3 @@ dEQP-VK.pipeline.fast_linked_library.misc.interpolate_at_sample_no_sample_shadin
 dEQP-VK.renderpass.multiple_subpasses_multiple_command_buffers.test,Fail
 
 dEQP-VK.glsl.loops.special.do_while_dynamic_iterations.dowhile_trap_vertex,Crash
-
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.composite_alpha,Crash
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.exclusive_nonzero_queues,Crash
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.image_array_layers,Crash
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.image_extent,Crash
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.image_format,Crash
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.image_usage,Crash
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.min_image_count,Crash
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.pre_transform,Crash
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.present_mode,Crash
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.clipped,Crash
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.composite_alpha,Crash
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_array_layers,Crash
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_extent,Crash
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_format,Crash
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_usage,Crash
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.min_image_count,Crash
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.pre_transform,Crash
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.present_mode,Crash
-dEQP-VK.wsi.xlib.swapchain.simulate_oom.clipped,Crash
-dEQP-VK.wsi.xlib.swapchain.simulate_oom.composite_alpha,Crash
-dEQP-VK.wsi.xlib.swapchain.simulate_oom.exclusive_nonzero_queues,Crash
-dEQP-VK.wsi.xlib.swapchain.simulate_oom.image_array_layers,Crash
-dEQP-VK.wsi.xlib.swapchain.simulate_oom.image_extent,Crash
-dEQP-VK.wsi.xlib.swapchain.simulate_oom.image_format,Crash
-dEQP-VK.wsi.xlib.swapchain.simulate_oom.min_image_count,Crash
-dEQP-VK.wsi.xlib.swapchain.simulate_oom.pre_transform,Crash
-dEQP-VK.wsi.xlib.swapchain.simulate_oom.present_mode,Crash
diff --git a/src/panfrost/ci/panfrost-g610-flakes.txt b/src/panfrost/ci/panfrost-g610-flakes.txt
index b3ba9629e63..91033c80bfc 100644
--- a/src/panfrost/ci/panfrost-g610-flakes.txt
+++ b/src/panfrost/ci/panfrost-g610-flakes.txt
@@ -257,9 +257,8 @@ dEQP-VK.texture.filtering.3d.combinations.nearest.linear.clamp_to_edge.repeat.cl
 dEQP-VK.texture.shadow.1d_array.linear_mipmap_linear.equal_x8_d24_unorm_pack32
 dEQP-VK.texture.shadow.cube.linear_mipmap_nearest.equal_d24_unorm_s8_uint
 
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.clipped
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.exclusive_nonzero_queues
-dEQP-VK.wsi.xlib.swapchain.simulate_oom.image_usage
+# No clue what's happening to these on CI lately
+dEQP-VK.wsi.*.swapchain.simulate_oom.*
 
 # With linux kernel 6.13-rc4 uprev
 dEQP-GLES31.functional.copy_image.compressed.viewclass_astc_8x6_rgba.rgba_astc_8x6_khr_srgb8_alpha8_astc_8x6_khr.texture3d_to_cubemap