diff --git a/src/imagination/ci/bxs-4-64-fails.txt b/src/imagination/ci/bxs-4-64-fails.txt
index 5c64c311dfb..45c12382c39 100644
--- a/src/imagination/ci/bxs-4-64-fails.txt
+++ b/src/imagination/ci/bxs-4-64-fails.txt
@@ -254,16 +254,4 @@ dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed99_multiview,
 dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed9_multiview,Fail
 dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.suballocation.attachment.4.568,Fail
 dEQP-VK.renderpasses.renderpass1.dedicated_allocation.attachment_allocation.input_output.71,Fail
-dEQP-VK.renderpasses.renderpass1.suballocation.attachment_allocation.input_output.71,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d24_unorm_s8_uint.compatibility_depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d24_unorm_s8_uint.compatibility_depth_zero_stencil_zero_testing_stencil,Crash
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d24_unorm_s8_uint_separate_layouts.compatibility_depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d24_unorm_s8_uint_separate_layouts.compatibility_depth_zero_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint.compatibility_depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint.compatibility_depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint.compatibility_depth_zero_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint.compatibility_depth_zero_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint_separate_layouts.compatibility_depth_none_stencil_zero_testing_stencil,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint_separate_layouts.compatibility_depth_zero_stencil_none_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint_separate_layouts.compatibility_depth_zero_stencil_zero_testing_depth,Fail
-dEQP-VK.renderpasses.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint_separate_layouts.compatibility_depth_zero_stencil_zero_testing_stencil,Fail
+dEQP-VK.renderpasses.renderpass1.suballocation.attachment_allocation.input_output.71,Fail
\ No newline at end of file
diff --git a/src/imagination/vulkan/rogue/pvr_blit.c b/src/imagination/vulkan/rogue/pvr_blit.c
index 00a859ab200..8cb3eb7a582 100644
--- a/src/imagination/vulkan/rogue/pvr_blit.c
+++ b/src/imagination/vulkan/rogue/pvr_blit.c
@@ -598,19 +598,20 @@ pvr_copy_or_resolve_image_region(struct pvr_cmd_buffer *cmd_buffer,
    }
 
    if (src->vk.samples > dst->vk.samples) {
-      /* Resolve op needs to know the actual format. */
-      dst_format =
-         vk_format_get_plane_aspect_format(dst->vk.format,
-                                           region->dstSubresource.aspectMask);
+      src_format = src->vk.format;
+      if (pvr_vk_format_is_combined_ds(src->vk.format) &&
+          dst->vk.format != VK_FORMAT_X8_D24_UNORM_PACK32) {
+         dst_format = dst->vk.format;
+      } else {
+         dst_format = src_format;
+      }
    } else {
       /* We don't care what format dst is as it's guaranteed to be size
        * compatible with src.
        */
-      dst_format = pvr_get_raw_copy_format(
-         vk_format_get_plane_aspect_format(src->vk.format,
-                                           region->srcSubresource.aspectMask));
+      dst_format = pvr_get_raw_copy_format(src->vk.format);
+      src_format = dst_format;
    }
-   src_format = dst_format;
 
    src_layers =
       vk_image_subresource_layer_count(&src->vk, &region->srcSubresource);