diff --git a/SYCL/SubGroup/generic-shuffle.cpp b/SYCL/SubGroup/generic-shuffle.cpp
index c973edf1c4..3ec9ef31bd 100644
--- a/SYCL/SubGroup/generic-shuffle.cpp
+++ b/SYCL/SubGroup/generic-shuffle.cpp
@@ -6,7 +6,6 @@
 //
 // Missing __spirv_SubgroupShuffleINTEL, __spirv_SubgroupShuffleUpINTEL,
 // __spirv_SubgroupShuffleDownINTEL, __spirv_SubgroupShuffleXorINTEL on AMD
-// XFAIL: hip_amd
 //
 //==-- generic_shuffle.cpp - SYCL sub_group generic shuffle test *- C++ -*--==//
 //
diff --git a/SYCL/SubGroup/shuffle.cpp b/SYCL/SubGroup/shuffle.cpp
index 5849535a76..b351f4635f 100644
--- a/SYCL/SubGroup/shuffle.cpp
+++ b/SYCL/SubGroup/shuffle.cpp
@@ -6,7 +6,6 @@
 //
 // Missing __spirv_SubgroupShuffleINTEL, __spirv_SubgroupShuffleUpINTEL,
 // __spirv_SubgroupShuffleDownINTEL, __spirv_SubgroupShuffleXorINTEL on AMD
-// XFAIL: hip_amd
 //
 //==------------ shuffle.cpp - SYCL sub_group shuffle test -----*- C++ -*---==//
 //
diff --git a/SYCL/SubGroup/shuffle_fp16.cpp b/SYCL/SubGroup/shuffle_fp16.cpp
index d471ab03be..93da06fa69 100644
--- a/SYCL/SubGroup/shuffle_fp16.cpp
+++ b/SYCL/SubGroup/shuffle_fp16.cpp
@@ -4,6 +4,10 @@
 // Missing __spirv_SubgroupShuffleINTEL, __spirv_SubgroupShuffleUpINTEL,
 // __spirv_SubgroupShuffleDownINTEL, __spirv_SubgroupShuffleXorINTEL on AMD
 // XFAIL: hip_amd
+// Even though `gfx908` and `gfx906` support halfs, libspirv is currently
+// built with `tahiti` as the target CPU, which means that clang rejects
+// AMD built-ins using halfs, for that reason half support has to stay
+// disabled.
 //
 //==------- shuffle_fp16.cpp - SYCL sub_group shuffle test -----*- C++ -*---==//
 //
diff --git a/SYCL/SubGroup/shuffle_fp64.cpp b/SYCL/SubGroup/shuffle_fp64.cpp
index 83ab7b497e..cb863cf993 100644
--- a/SYCL/SubGroup/shuffle_fp64.cpp
+++ b/SYCL/SubGroup/shuffle_fp64.cpp
@@ -6,7 +6,6 @@
 //
 // Missing __spirv_SubgroupShuffleINTEL, __spirv_SubgroupShuffleUpINTEL,
 // __spirv_SubgroupShuffleDownINTEL, __spirv_SubgroupShuffleXorINTEL on AMD
-// XFAIL: hip_amd
 //
 //==------- shuffle_fp64.cpp - SYCL sub_group shuffle test -----*- C++ -*---==//
 //