diff --git a/src/panfrost/ci/panfrost-g52-skips.txt b/src/panfrost/ci/panfrost-g52-skips.txt
index d08fcae92af..cc5f7e99497 100644
--- a/src/panfrost/ci/panfrost-g52-skips.txt
+++ b/src/panfrost/ci/panfrost-g52-skips.txt
@@ -106,23 +106,6 @@ dEQP-VK.graphicsfuzz.spv-composites
 # Cause OOM when running with alloacation tests
 dEQP-VK.api.command_buffers.many_indirect_draws_on_secondary
 
-# Slow tests (>= 30s)
-afbcp-spec@arb_texture_multisample@texelfetch fs sampler2dms 4 1x130-501x130
-afbcp-spec@arb_texture_multisample@texelfetch fs sampler2dms 4 1x71-501x71
-dEQP-VK.api.external.fence.sync_fd.export_multiple_times_temporary
-dEQP-VK.api.external.semaphore.sync_fd.export_multiple_times_temporary
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.image_extent
-glx@glx_arb_sync_control@swapbuffersmsc-return swap_interval 0
-spec@!opengl 1.1@copypixels-draw-sync
-spec@!opengl 1.1@copypixels-sync
-spec@!opengl 1.1@draw-sync
-spec@arb_texture_multisample@texelfetch fs sampler2dms 4 1x130-501x130
-spec@arb_texture_multisample@texelfetch fs sampler2dms 4 1x71-501x71
-spec@arb_texture_multisample@texelfetch fs sampler2dmsarray 4 98x1x9-98x129x9
-spec@egl_khr_gl_colorspace@linear
-spec@ext_framebuffer_blit@fbo-blit-check-limits
-spec@glsl-1.30@execution@texelfetch fs sampler2d 1x281-501x281
-
 # Those are failures on G52 but skipped on "G52 r1"
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_no_cab.8_bit
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.copy_with_regions_before_resolving.8_bit
diff --git a/src/panfrost/ci/panfrost-g52-slow-skips.txt b/src/panfrost/ci/panfrost-g52-slow-skips.txt
new file mode 100644
index 00000000000..cc4a1ff0157
--- /dev/null
+++ b/src/panfrost/ci/panfrost-g52-slow-skips.txt
@@ -0,0 +1,15 @@
+afbcp-spec@arb_texture_multisample@texelfetch fs sampler2dms 4 1x130-501x130
+afbcp-spec@arb_texture_multisample@texelfetch fs sampler2dms 4 1x71-501x71
+dEQP-VK.api.external.fence.sync_fd.export_multiple_times_temporary
+dEQP-VK.api.external.semaphore.sync_fd.export_multiple_times_temporary
+dEQP-VK.wsi.wayland.swapchain.simulate_oom.image_extent
+glx@glx_arb_sync_control@swapbuffersmsc-return swap_interval 0
+spec@!opengl 1.1@copypixels-draw-sync
+spec@!opengl 1.1@copypixels-sync
+spec@!opengl 1.1@draw-sync
+spec@arb_texture_multisample@texelfetch fs sampler2dms 4 1x130-501x130
+spec@arb_texture_multisample@texelfetch fs sampler2dms 4 1x71-501x71
+spec@arb_texture_multisample@texelfetch fs sampler2dmsarray 4 98x1x9-98x129x9
+spec@egl_khr_gl_colorspace@linear
+spec@ext_framebuffer_blit@fbo-blit-check-limits
+spec@glsl-1.30@execution@texelfetch fs sampler2d 1x281-501x281
diff --git a/src/panfrost/ci/panfrost-g610-skips.txt b/src/panfrost/ci/panfrost-g610-skips.txt
index 8a50171c06a..fa9fbb368dd 100644
--- a/src/panfrost/ci/panfrost-g610-skips.txt
+++ b/src/panfrost/ci/panfrost-g610-skips.txt
@@ -1,8 +1,3 @@
-# Slow tests (>= 30s)
-dEQP-VK.api.external.fence.sync_fd.export_multiple_times_temporary
-dEQP-VK.api.external.semaphore.sync_fd.export_multiple_times_temporary
-dEQP-VK.wsi.wayland.swapchain.simulate_oom.image_extent
-
 # tests leak on separate render+display devices:
 #   https://gerrit.khronos.org/c/vk-gl-cts/+/19625
 asan-dEQP-VK.image.swapchain_mutable.direct_drm.*
diff --git a/src/panfrost/ci/panfrost-g610-slow-skips.txt b/src/panfrost/ci/panfrost-g610-slow-skips.txt
new file mode 100644
index 00000000000..b2952ff5cc8
--- /dev/null
+++ b/src/panfrost/ci/panfrost-g610-slow-skips.txt
@@ -0,0 +1,3 @@
+dEQP-VK.api.external.fence.sync_fd.export_multiple_times_temporary
+dEQP-VK.api.external.semaphore.sync_fd.export_multiple_times_temporary
+dEQP-VK.wsi.wayland.swapchain.simulate_oom.image_extent
diff --git a/src/panfrost/ci/panfrost-g720-skips.txt b/src/panfrost/ci/panfrost-g720-slow-skips.txt
similarity index 100%
rename from src/panfrost/ci/panfrost-g720-skips.txt
rename to src/panfrost/ci/panfrost-g720-slow-skips.txt
diff --git a/src/panfrost/ci/panfrost-g925-skips.txt b/src/panfrost/ci/panfrost-g925-slow-skips.txt
similarity index 100%
rename from src/panfrost/ci/panfrost-g925-skips.txt
rename to src/panfrost/ci/panfrost-g925-slow-skips.txt
diff --git a/src/panfrost/ci/panfrost-t860-skips.txt b/src/panfrost/ci/panfrost-t860-skips.txt
index 0346014e5f5..07a7c9d763d 100644
--- a/src/panfrost/ci/panfrost-t860-skips.txt
+++ b/src/panfrost/ci/panfrost-t860-skips.txt
@@ -2,12 +2,6 @@
 # non-zero-length and not starting with '#', will regex match to
 # delete lines from the test list.  Be careful.
 
-# These are really slow on tiling architectures (including llvmpipe).
-dEQP-GLES[0-9]*.functional.flush_finish.*
-
-# Slow, and indirect draws are emulated in Midgard anyway.
-dEQP-GLES31.functional.draw_indirect.compute_interop.large.*
-
 # Mix of passes, flakes, and fails, with little discernible pattern. Skip.
 dEQP-GLES3.functional.draw_buffers_indexed.random.*
 
diff --git a/src/panfrost/ci/panfrost-t860-slow-skips.txt b/src/panfrost/ci/panfrost-t860-slow-skips.txt
new file mode 100644
index 00000000000..c12fdcfdffe
--- /dev/null
+++ b/src/panfrost/ci/panfrost-t860-slow-skips.txt
@@ -0,0 +1,5 @@
+# These are really slow on tiling architectures (including llvmpipe).
+dEQP-GLES[0-9]*.functional.flush_finish.*
+
+# Slow, and indirect draws are emulated in Midgard anyway.
+dEQP-GLES31.functional.draw_indirect.compute_interop.large.*