diff --git a/src/amd/ci/radv-navi21-aco-flakes.txt b/src/amd/ci/radv-navi21-aco-flakes.txt
index 0ce4a6c87c2..f91880b85d9 100644
--- a/src/amd/ci/radv-navi21-aco-flakes.txt
+++ b/src/amd/ci/radv-navi21-aco-flakes.txt
@@ -1,6 +1,5 @@
 dEQP-VK.query_pool.statistics_query.host_query_reset.geometry_shader_(invocations|primitives).secondary.(32|64)bits_.*
 
-dEQP-VK.ray_tracing_pipeline.pipeline_library.configurations.(single|multi)threaded_compilation.*
 dEQP-VK.ray_tracing_pipeline.pipeline_no_null_shaders_flag.*
 
 dEQP-VK.shader_object.binding.mesh_swap_task
@@ -13,7 +12,6 @@ dEQP-VK.pipeline.monolithic.sampler.separate_stencil_usage.view_type.cube_array.
 dEQP-VK.pipeline.shader_object_linked_binary.image.suballocation.sampling_type.separate.view_type.1d_array.format.r8_srgb.count_1.size.443x1_array_of_3
 dEQP-VK.pipeline.shader_object_unlinked_binary.image.suballocation.sampling_type.combined.view_type.1d.format.r8_unorm.count_8.size.443x1
 dEQP-VK.pipeline.shader_object_unlinked_binary.image.suballocation.sampling_type.separate.view_type.1d_array.format.a1b5g5r5_unorm_pack16_khr.count_8.size.443x1_array_of_6
-dEQP-VK.ray_tracing_pipeline.pipeline_library.configurations.misc.maintenance5
 dEQP-VK.ray_tracing_pipeline.pipeline_no_null_shaders_flag.gpu.boxes.stride_3.offset_7.use_libs.isect_or_miss
 dEQP-VK.ray_tracing_pipeline.pipeline_no_null_shaders_flag.gpu.boxes.stride_5.offset_7.use_libs.any_or_miss
 dEQP-VK.ray_tracing_pipeline.pipeline_no_null_shaders_flag.gpu.triangles.stride_3.offset_7.use_libs.any
diff --git a/src/amd/ci/radv-navi31-aco-flakes.txt b/src/amd/ci/radv-navi31-aco-flakes.txt
index 5c9d70986da..869b4840f4a 100644
--- a/src/amd/ci/radv-navi31-aco-flakes.txt
+++ b/src/amd/ci/radv-navi31-aco-flakes.txt
@@ -1,6 +1,5 @@
 dEQP-VK.memory.mapping.suballocation.sub.1048577.offset_0.size_1048575.subinvalidate_overlapping
 
-dEQP-VK.ray_tracing_pipeline.pipeline_library.configurations.(single|multi)threaded_compilation.*
 dEQP-VK.ray_tracing_pipeline.pipeline_no_null_shaders_flag.*
 
 # New CTS flakes in 1.3.8.0
diff --git a/src/amd/ci/radv-vangogh-aco-flakes.txt b/src/amd/ci/radv-vangogh-aco-flakes.txt
index a165732e9e8..68df89f5afd 100644
--- a/src/amd/ci/radv-vangogh-aco-flakes.txt
+++ b/src/amd/ci/radv-vangogh-aco-flakes.txt
@@ -1,6 +1,5 @@
 dEQP-VK.fragment_shading_barycentric.fast_linked_library.data.provoking_last.dynamic.triangle_list.array2.dvec2
 
-dEQP-VK.ray_tracing_pipeline.pipeline_library.configurations.(single|multi)threaded_compilation.*
 dEQP-VK.ray_tracing_pipeline.pipeline_no_null_shaders_flag.*
 
 # Nightly run expectations update
diff --git a/src/amd/vulkan/radv_pipeline_rt.c b/src/amd/vulkan/radv_pipeline_rt.c
index d7eb61a7339..8d9ba4d6047 100644
--- a/src/amd/vulkan/radv_pipeline_rt.c
+++ b/src/amd/vulkan/radv_pipeline_rt.c
@@ -913,9 +913,12 @@ radv_rt_pipeline_compile(struct radv_device *device, const VkRayTracingPipelineC
     * - shaders are captured because it's for debugging purposes
     * - binaries are captured for later uses
     * - ray history is enabled
+    * - group handles are saved and reused on a subsequent run (ie. capture/replay)
     */
    if (keep_executable_info || emit_ray_history ||
-       (pipeline->base.base.create_flags & VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR)) {
+       (pipeline->base.base.create_flags &
+        (VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR |
+         VK_PIPELINE_CREATE_2_RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY_BIT_KHR))) {
       skip_shaders_cache = true;
    }