diff --git a/src/amd/ci/external/radv-hawaii-aco-skips.txt b/src/amd/ci/external/radv-hawaii-aco-skips.txt
deleted file mode 100644
index 1238ee07224..00000000000
--- a/src/amd/ci/external/radv-hawaii-aco-skips.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# This subset of CTS randomly hangs but it's fine when using only one thread.
-dEQP-VK.synchronization.*
diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml
index 97ef2acf87a..891c6ea42d9 100644
--- a/src/amd/ci/gitlab-ci-inc.yml
+++ b/src/amd/ci/gitlab-ci-inc.yml
@@ -322,6 +322,16 @@
     - farm:$RUNNER_FARM_LOCATION
     - $B2C_MARS_SETUP_TAGS
 
+.hawaii-test-valve:
+  variables:
+    FDO_CI_CONCURRENT: 24
+    RUNNER_FARM_LOCATION: mupuf
+    B2C_MARS_SETUP_TAGS: amdgpu:codename:HAWAII
+    B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g'
+  tags:
+    - farm:$RUNNER_FARM_LOCATION
+    - $B2C_MARS_SETUP_TAGS
+
 .kabini-test-valve:
   variables:
     RUNNER_FARM_LOCATION: mupuf
diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index d285eb2742f..04faae726f0 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -202,6 +202,18 @@ vkcts-tahiti-valve:
     B2C_TIMEOUT_OVERALL_MINUTES: 50
     B2C_TIMEOUT_BOOT_RETRIES: 0
 
+vkcts-hawaii-valve:
+  extends:
+    - .vkcts-test-valve
+    - .hawaii-test-valve
+    - .radv-valve-manual-rules
+  timeout: 1h
+  variables:
+    GPU_VERSION: radv-hawaii-aco
+    B2C_TIMEOUT_BOOT_MINUTES: 50
+    B2C_TIMEOUT_OVERALL_MINUTES: 50
+    B2C_TIMEOUT_BOOT_RETRIES: 0
+
 vkcts-polaris10-valve:
   extends:
     - .vkcts-test-valve
@@ -378,6 +390,17 @@ vkd3d-tahiti-valve:
     # Random tests fail/crash when trying to run them in parallel
     FDO_CI_CONCURRENT: 1
 
+vkd3d-hawaii-valve:
+  extends:
+    - .b2c-test-radv-vk
+    - .b2c-vkd3d-proton-test
+    - .hawaii-test-valve
+    - .radv-valve-manual-rules
+  variables:
+    GPU_VERSION: radv-hawaii
+    # Random tests fail/crash when trying to run them in parallel
+    FDO_CI_CONCURRENT: 1
+
 vkd3d-polaris10-valve:
   extends:
     - .b2c-test-radv-vk
diff --git a/src/amd/ci/radv-hawaii-aco-flakes.txt b/src/amd/ci/radv-hawaii-aco-flakes.txt
new file mode 100644
index 00000000000..d2bd7869678
--- /dev/null
+++ b/src/amd/ci/radv-hawaii-aco-flakes.txt
@@ -0,0 +1,22 @@
+dEQP-VK.api.buffer_marker.compute.default_mem.bottom_of_pipe.memory_dep.buffer_copy
+dEQP-VK.api.buffer_marker.compute.default_mem.bottom_of_pipe.memory_dep.buffer_copy_offset_24
+dEQP-VK.api.buffer_marker.compute.default_mem.bottom_of_pipe.memory_dep.dispatch
+dEQP-VK.api.buffer_marker.compute.default_mem.bottom_of_pipe.memory_dep.dispatch_offset_24
+dEQP-VK.api.buffer_marker.compute.external_host_mem.bottom_of_pipe.memory_dep.buffer_copy
+dEQP-VK.api.buffer_marker.compute.external_host_mem.bottom_of_pipe.memory_dep.buffer_copy_offset_24
+dEQP-VK.api.buffer_marker.graphics.external_host_mem.bottom_of_pipe.memory_dep.dispatch
+dEQP-VK.pipeline.fast_linked_library.multisample.misc.clear_attachments.r8g8b8a8_unorm_r16g16b16a16_sfloat_r32g32b32a32_uint_s8_uint.8x.ds_resolve_max.sub_framebuffer
+dEQP-VK.pipeline.fast_linked_library.multisample.misc.dynamic_rendering.clear_attachments.r8g8b8a8_unorm_r16g16b16a16_sfloat_r16g16b16a16_sint_d16_unorm.8x.ds_resolve_max.whole_framebuffer
+dEQP-VK.pipeline.fast_linked_library.multisample.misc.dynamic_rendering.clear_attachments.r8g8b8a8_unorm_r16g16b16a16_sfloat_r16g16b16a16_sint_s8_uint.8x.ds_resolve_max.whole_framebuffer
+dEQP-VK.pipeline.monolithic.multisample.misc.basic.r8g8b8a8_unorm_r16g16b16a16_sfloat_r32g32b32a32_uint_d16_unorm.2x.ds_resolve_max.whole_framebuffer
+dEQP-VK.pipeline.monolithic.multisample.misc.dynamic_rendering.clear_attachments.r8g8b8a8_unorm_r16g16b16a16_sfloat_r16g16b16a16_sint_d16_unorm.8x.ds_resolve_max.sub_framebuffer
+dEQP-VK.pipeline.monolithic.multisample.misc.dynamic_rendering.clear_attachments.r8g8b8a8_unorm_r16g16b16a16_sfloat_r32g32b32a32_uint_d16_unorm.8x.ds_resolve_sample_zero.sub_framebuffer
+dEQP-VK.pipeline.monolithic.multisample.storage_image.64x64_1.r32_uint.samples_2
+dEQP-VK.pipeline.pipeline_library.multisample.misc.clear_attachments.r8g8b8a8_unorm_r16g16b16a16_sfloat_r16g16b16a16_sint_s8_uint.4x.ds_resolve_sample_zero.sub_framebuffer
+dEQP-VK.pipeline.pipeline_library.multisample.misc.clear_attachments.r8g8b8a8_unorm_r16g16b16a16_sfloat_r16g16b16a16_sint_s8_uint.8x.ds_resolve_max.whole_framebuffer
+dEQP-VK.pipeline.pipeline_library.multisample.misc.dynamic_rendering.clear_attachments.r8g8b8a8_unorm_r16g16b16a16_sfloat_r16g16b16a16_sint_s8_uint.8x.ds_resolve_sample_zero.sub_framebuffer
+dEQP-VK.pipeline.shader_object_unlinked_binary.multisample.misc.dynamic_rendering.clear_attachments.r8g8b8a8_unorm_r16g16b16a16_sfloat_r16g16b16a16_sint_d16_unorm.4x.ds_resolve_max.whole_framebuffer
+dEQP-VK.pipeline.shader_object_unlinked_binary.multisample.misc.dynamic_rendering.clear_attachments.r8g8b8a8_unorm_r16g16b16a16_sfloat_r16g16b16a16_sint_d16_unorm.8x.ds_resolve_sample_zero.whole_framebuffer
+dEQP-VK.pipeline.shader_object_unlinked_spirv.interface_matching.vector_length.out_uvec4_in_uvec2_member_of_array_of_structures_in_block_vert_tesc_tese_geom_out_frag_in
+dEQP-VK.pipeline.shader_object_unlinked_spirv.multisample.misc.dynamic_rendering.clear_attachments.r8g8b8a8_unorm_r16g16b16a16_sfloat_r32g32b32a32_uint_d16_unorm.2x.ds_resolve_max.sub_framebuffer
+dEQP-VK.pipeline.shader_object_unlinked_spirv.multisample.misc.multi_subpass.r8g8b8a8_unorm_r16g16b16a16_sfloat_r16g16b16a16_sint_s8_uint.random_153
diff --git a/src/amd/ci/radv-hawaii-aco-skips.txt b/src/amd/ci/radv-hawaii-aco-skips.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/amd/ci/radv-hawaii-vkd3d-fails.txt b/src/amd/ci/radv-hawaii-vkd3d-fails.txt
new file mode 100644
index 00000000000..183bdbc1f3f
--- /dev/null
+++ b/src/amd/ci/radv-hawaii-vkd3d-fails.txt
@@ -0,0 +1 @@
+test_vbv_stride_edge_cases,Fail