diff --git a/src/panfrost/ci/panfrost-g57-skips.txt b/src/panfrost/ci/panfrost-g57-skips.txt
index 7f96a266f8b..8ff6587137b 100644
--- a/src/panfrost/ci/panfrost-g57-skips.txt
+++ b/src/panfrost/ci/panfrost-g57-skips.txt
@@ -58,3 +58,6 @@ spec@glsl-1.30@execution@tex-miplevel-selection textureprojoffset 2drect_projvec
 spec@glsl-1.30@execution@tex-miplevel-selection textureprojoffset 2drectshadow
 spec@!opengl 1.0@rasterpos
 spec@!opengl es 3.0@gles-3.0-transform-feedback-uniform-buffer-object
+
+# May time out
+glx@glx_arb_sync_control@swapbuffersmsc-return
diff --git a/src/panfrost/ci/panfrost-g925-flakes.txt b/src/panfrost/ci/panfrost-g925-flakes.txt
index 3ac09f56b2a..8e6387a7a70 100644
--- a/src/panfrost/ci/panfrost-g925-flakes.txt
+++ b/src/panfrost/ci/panfrost-g925-flakes.txt
@@ -34,3 +34,36 @@ angle-multisample-dEQP-GLES31.functional.draw_indirect.compute_interop.large.dra
 # 19:50:56.843: [   92.988186] panthor 48000000.gpu: [drm] *ERROR* CSG 7 update request timedout
 # 19:50:56.843: [   92.995306] panthor 48000000.gpu: [drm] *ERROR* CSG suspend failed, escalating to termination
 dEQP-VK.sparse_resources.buffer.ssbo.sparse_residency.non_resident_buffer_copy_src_alloc_partial_16777216
+
+dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.instanced.dynamic_state_draw_indexed_indirect_vk_primitive_topology_point_list_attrib_divisor_20_multiview_maintenance_5
+dEQP-VK.draw.renderpass.indirect_draw.sequential_data_from_compute.indirect_draw_instanced.first_instance.triangle_list
+dEQP-VK.draw.renderpass.instanced.draw_indexed_vk_primitive_topology_triangle_fan_attrib_divisor_2_multiview_maintenance_5
+dEQP-VK.graphicsfuzz.cov-global-loop-counter-accumulate-integer-condition-large-array-elements
+dEQP-VK.graphicsfuzz.cov-variable-copy-in-function-tex-sample
+dEQP-VK.image.swapchain_mutable.wayland.2d.b8g8r8a8_unorm_r8g8b8a8_srgb_copy_copy_format_list
+dEQP-VK.memory.pipeline_barrier.host_write_vertex_buffer.1048576_vertex_buffer_stride_2
+dEQP-VK.pipeline.fast_linked_library.stencil.format.d24_unorm_s8_uint.states.fail_decw.pass_zero.dfail_wrap.comp_greater.any
+dEQP-VK.subgroups.arithmetic.graphics.subgroupexclusiveadd_u64vec2
+dEQP-VK.subgroups.arithmetic.graphics.subgroupinclusivemax_uint8_t
+dEQP-VK.subgroups.ballot_broadcast.graphics.subgroupbroadcastfirst_u8vec2
+dEQP-VK.subgroups.shuffle.graphics.subgroupclusteredrotate_u16vec3_constant
+dEQP-VK.subgroups.shuffle.graphics.subgroupshuffledown_float_constant
+dEQP-VK.subgroups.shuffle.graphics.subgroupshufflexor_ivec2
+dEQP-VK.synchronization.op.single_queue.fence.write_blit_image_read_image_compute.image_128x128_r8g8b8a8_unorm
+dEQP-VK.synchronization.signal_order.timeline_semaphore.write_copy_image_read_image_compute.image_128x128_r16_uint
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_linear_linear_mipmap_linear_clamp
+dEQP-VK.texture.filtering.cube.formats.a1r5g5b5_unorm.linear.seamless
+dEQP-VK.wsi.wayland.maintenance1.scaling.resize_window.immediate.aspect_stretch.max_min.swapchain_smaller_taller_aspect
+dEQP-VK.wsi.wayland.present_id_wait.wait.single_no_timeout
+dEQP-VK.wsi.wayland.swapchain.create.clipped
+dEQP-VK.wsi.wayland.swapchain.render.basic
+dEQP-VK.wsi.xcb.maintenance1.deferred_alloc.immediate.bind_image
+dEQP-VK.wsi.xcb.maintenance1.present_modes.heterogenous.immediate_mailbox_immediate
+dEQP-VK.wsi.xcb.maintenance1.scaling.continuous.one_to_one.max_min.swapchain_smaller_wider_aspect
+dEQP-VK.wsi.xcb.maintenance1.scaling.demand.aspect_stretch.max_max.swapchain_smaller_wider_aspect
+dEQP-VK.wsi.xcb.maintenance1.scaling.fifo.aspect_stretch.max_center.swapchain_bigger_same_aspect
+dEQP-VK.wsi.xcb.swapchain.create.clipped
+dEQP-VK.wsi.xcb.swapchain.create.image_array_layers
+dEQP-VK.wsi.xlib.maintenance1.scaling.demand.one_to_one.center_center.swapchain_taller
+dEQP-VK.wsi.xlib.maintenance1.scaling.resize_window.mailbox.aspect_stretch.center_max.swapchain_smaller_taller_aspect
+dEQP-VK.wsi.xlib.surface.query_capabilities2
diff --git a/src/panfrost/ci/panfrost-g925-skips.txt b/src/panfrost/ci/panfrost-g925-skips.txt
index a3c1a6ba42d..795347e5916 100644
--- a/src/panfrost/ci/panfrost-g925-skips.txt
+++ b/src/panfrost/ci/panfrost-g925-skips.txt
@@ -6,3 +6,7 @@ dEQP-VK.api.external.semaphore.sync_fd.export_multiple_times_temporary
 dEQP-VK.wsi.xlib.maintenance1.present_modes.*
 dEQP-VK.wsi.xlib.maintenance1.deferred_alloc.fifo.*
 dEQP-VK.wsi.xlib.maintenance1.present_fence.fifo.*
+
+# May time out
+dEQP-VK.wsi.wayland.maintenance1.present_modes.fifo.change_modes_multi_swapchain
+dEQP-VK.wsi.wayland.swapchain.render.10swapchains