diff --git a/src/amd/ci/radv-pitcairn-aco-fails.txt b/src/amd/ci/radv-pitcairn-aco-fails.txt
index e69de29bb2d..9dddf2a464e 100644
--- a/src/amd/ci/radv-pitcairn-aco-fails.txt
+++ b/src/amd/ci/radv-pitcairn-aco-fails.txt
@@ -0,0 +1,9 @@
+dEQP-VK.api.copy_and_blit.copy_commands2.resolve_image.layer_copy_before_resolving.2_bit,Fail
+dEQP-VK.api.copy_and_blit.copy_commands2.resolve_image.layer_copy_before_resolving.4_bit,Fail
+dEQP-VK.api.copy_and_blit.copy_commands2.resolve_image.layer_copy_before_resolving.8_bit,Fail
+dEQP-VK.api.copy_and_blit.core.resolve_image.layer_copy_before_resolving.2_bit,Fail
+dEQP-VK.api.copy_and_blit.core.resolve_image.layer_copy_before_resolving.4_bit,Fail
+dEQP-VK.api.copy_and_blit.core.resolve_image.layer_copy_before_resolving.8_bit,Fail
+dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.layer_copy_before_resolving.2_bit,Fail
+dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.layer_copy_before_resolving.4_bit,Fail
+dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.layer_copy_before_resolving.8_bit,Fail
diff --git a/src/amd/ci/radv-sienna_cichlid-aco-flakes.txt b/src/amd/ci/radv-sienna_cichlid-aco-flakes.txt
new file mode 100644
index 00000000000..59659f13e39
--- /dev/null
+++ b/src/amd/ci/radv-sienna_cichlid-aco-flakes.txt
@@ -0,0 +1,6 @@
+dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_2.d32_sfloat_s8_uint.depth_zero_stencil_zero_testing_stencil_samplemask
+dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_max_testing_stencil_samplemask
+dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_4.d16_unorm_s8_uint.depth_zero_stencil_max_testing_stencil_samplemask
+dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_4.d16_unorm_s8_uint.depth_zero_stencil_zero_testing_stencil_samplemask
+dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_5_1.samples_2.d32_sfloat_s8_uint.depth_zero_stencil_zero_testing_stencil_samplemask
+dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_8_32.samples_2.d32_sfloat_s8_uint_separate_layouts.depth_zero_stencil_min_testing_stencil_samplemask
diff --git a/src/amd/ci/radv-skips.txt b/src/amd/ci/radv-skips.txt
index 9b9c0748e42..0a4842777d5 100644
--- a/src/amd/ci/radv-skips.txt
+++ b/src/amd/ci/radv-skips.txt
@@ -8,6 +8,5 @@ dEQP-VK.wsi.*
 # Exclude this test which timeout most of the time.
 dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576
 
-# Exclude this test because it fails with VK_KHR_maintenance4 and the CTS fix
-# hasn't landed yet.
-dEQP-VK.api.buffer.basic.size_max_uint64
+# Exclude this test which fails on all GPUS except RDNA2+.
+dEQP-VK.api.driver_properties.conformance_version