diff --git a/src/amd/ci/deqp-radv.toml b/src/amd/ci/deqp-radv.toml
index 3b5c077f1f3..c1bcf193e88 100644
--- a/src/amd/ci/deqp-radv.toml
+++ b/src/amd/ci/deqp-radv.toml
@@ -2,5 +2,6 @@
 [[deqp]]
 deqp = "/deqp-vk-main/external/vulkancts/modules/vulkan/deqp-vk"
 caselists = ["/deqp-vk-main/mustpass/vk-main.txt"]
+skips = ["/builds/mesa/mesa/install/radv-slow-skips.txt"]
 tests_per_group = 5000
 renderer_check = "RADV"
diff --git a/src/amd/ci/radv-skips.txt b/src/amd/ci/radv-skips.txt
index d53a5c9a7d4..828e7e8f53e 100644
--- a/src/amd/ci/radv-skips.txt
+++ b/src/amd/ci/radv-skips.txt
@@ -1,48 +1,6 @@
-# Exclude these memory tests that usually take more than 30s to complete.
-dEQP-VK.memory.mapping.dedicated_alloc.image.full.1048577.*
-dEQP-VK.memory.pipeline_barrier.all.1048576_vertex_buffer_stride_2
-dEQP-VK.memory.pipeline_barrier.all.1048576_vertex_buffer_stride_4
-dEQP-VK.memory.pipeline_barrier.all.65536_vertex_buffer_stride_2
-dEQP-VK.memory.pipeline_barrier.all.65536_vertex_buffer_stride_4
-dEQP-VK.memory.pipeline_barrier.host_read_host_write.1048576
-dEQP-VK.memory.pipeline_barrier.host_read_host_write.65536
-dEQP-VK.memory.pipeline_barrier.host_write_transfer_src.1048576
-dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576
-
-# Those cases take very long.
-dEQP-VK.ray_tracing_pipeline.build.*1048576.*
-dEQP-VK.ray_tracing_pipeline.build.*65536.*
-dEQP-VK.ray_tracing_pipeline.build.*_4096_4_4
-dEQP-VK.ray_tracing_pipeline.build.*_4_4096_4
-dEQP-VK.ray_tracing_pipeline.build.*_4_4_4096
-
-dEQP-VK.ray_tracing_pipeline.large_shader_set.*.4096
-
-dEQP-VK.ray_tracing_pipeline.misc.maxrtinvocations_AABB
-dEQP-VK.ray_tracing_pipeline.misc.maxrtinvocations_tri
-
-# Those cases take very long and hang the gpu.
-dEQP-VK.ray_tracing_pipeline.misc.recursiveTraces_AABB_11
-dEQP-VK.ray_tracing_pipeline.misc.recursiveTraces_AABB_12
-dEQP-VK.ray_tracing_pipeline.misc.recursiveTraces_AABB_13
-dEQP-VK.ray_tracing_pipeline.misc.recursiveTraces_AABB_14
-dEQP-VK.ray_tracing_pipeline.misc.recursiveTraces_AABB_15
-dEQP-VK.ray_tracing_pipeline.misc.recursiveTraces_tri_11
-dEQP-VK.ray_tracing_pipeline.misc.recursiveTraces_tri_12
-dEQP-VK.ray_tracing_pipeline.misc.recursiveTraces_tri_13
-dEQP-VK.ray_tracing_pipeline.misc.recursiveTraces_tri_14
-dEQP-VK.ray_tracing_pipeline.misc.recursiveTraces_tri_15
-
-# Those cases seem to usually timeout.
-dEQP-VK.binding_model.descriptor_buffer.*.multiple.*buffers32_sets1
-
-# These cases are slow.
-dEQP-VK.texture.explicit_lod.2d.sizes.128x128_.*
-dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic
-
-# Some reconvergence tests are very slow.
-dEQP-VK.reconvergence.(subgroup|workgroup)_uniform_control_flow_(ballot|elect).compute.nesting4.*
-dEQP-VK.reconvergence.maximal.compute.nesting4.7.38
+###
+# This file should only contain tests that cause GPU hangs.
+##
 
 # This test can cause random GPU hangs for very weird reasons, needs to be
 # investigated.
diff --git a/src/amd/ci/radv-slow-skips.txt b/src/amd/ci/radv-slow-skips.txt
new file mode 100644
index 00000000000..24169198670
--- /dev/null
+++ b/src/amd/ci/radv-slow-skips.txt
@@ -0,0 +1,49 @@
+###
+# This file should only contain tests that are very slow to run.
+###
+
+# Exclude these memory tests that usually take more than 30s to complete.
+dEQP-VK.memory.mapping.dedicated_alloc.image.full.1048577.*
+dEQP-VK.memory.pipeline_barrier.all.1048576_vertex_buffer_stride_2
+dEQP-VK.memory.pipeline_barrier.all.1048576_vertex_buffer_stride_4
+dEQP-VK.memory.pipeline_barrier.all.65536_vertex_buffer_stride_2
+dEQP-VK.memory.pipeline_barrier.all.65536_vertex_buffer_stride_4
+dEQP-VK.memory.pipeline_barrier.host_read_host_write.1048576
+dEQP-VK.memory.pipeline_barrier.host_read_host_write.65536
+dEQP-VK.memory.pipeline_barrier.host_write_transfer_src.1048576
+dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576
+
+# Those cases take very long.
+dEQP-VK.ray_tracing_pipeline.build.*1048576.*
+dEQP-VK.ray_tracing_pipeline.build.*65536.*
+dEQP-VK.ray_tracing_pipeline.build.*_4096_4_4
+dEQP-VK.ray_tracing_pipeline.build.*_4_4096_4
+dEQP-VK.ray_tracing_pipeline.build.*_4_4_4096
+
+dEQP-VK.ray_tracing_pipeline.large_shader_set.*.4096
+
+dEQP-VK.ray_tracing_pipeline.misc.maxrtinvocations_AABB
+dEQP-VK.ray_tracing_pipeline.misc.maxrtinvocations_tri
+
+# Those cases take very long and hang the gpu.
+dEQP-VK.ray_tracing_pipeline.misc.recursiveTraces_AABB_11
+dEQP-VK.ray_tracing_pipeline.misc.recursiveTraces_AABB_12
+dEQP-VK.ray_tracing_pipeline.misc.recursiveTraces_AABB_13
+dEQP-VK.ray_tracing_pipeline.misc.recursiveTraces_AABB_14
+dEQP-VK.ray_tracing_pipeline.misc.recursiveTraces_AABB_15
+dEQP-VK.ray_tracing_pipeline.misc.recursiveTraces_tri_11
+dEQP-VK.ray_tracing_pipeline.misc.recursiveTraces_tri_12
+dEQP-VK.ray_tracing_pipeline.misc.recursiveTraces_tri_13
+dEQP-VK.ray_tracing_pipeline.misc.recursiveTraces_tri_14
+dEQP-VK.ray_tracing_pipeline.misc.recursiveTraces_tri_15
+
+# Those cases seem to usually timeout.
+dEQP-VK.binding_model.descriptor_buffer.*.multiple.*buffers32_sets1
+
+# These cases are slow.
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_.*
+dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic
+
+# Some reconvergence tests are very slow.
+dEQP-VK.reconvergence.(subgroup|workgroup)_uniform_control_flow_(ballot|elect).compute.nesting4.*
+dEQP-VK.reconvergence.maximal.compute.nesting4.7.38