diff --git a/SYCL/Basic/kernel_info.cpp b/SYCL/Basic/kernel_info.cpp
index 61eaea8d22..60ef3539cb 100644
--- a/SYCL/Basic/kernel_info.cpp
+++ b/SYCL/Basic/kernel_info.cpp
@@ -5,9 +5,6 @@
 //
 // Fail is flaky for level_zero, enable when fixed.
 // UNSUPPORTED: level_zero
-//
-// Failing on HIP AMD and HIP Nvidia
-// XFAIL: hip_amd || hip_nvidia
 
 //==--- kernel_info.cpp - SYCL kernel info test ----------------------------==//
 //
diff --git a/SYCL/Basic/linear-sub_group.cpp b/SYCL/Basic/linear-sub_group.cpp
index 05163fd7af..e3f421e136 100644
--- a/SYCL/Basic/linear-sub_group.cpp
+++ b/SYCL/Basic/linear-sub_group.cpp
@@ -4,8 +4,6 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 //
-// Missing built-ins on AMD
-// XFAIL: hip_amd
 //==--------------- linear-sub_group.cpp - SYCL linear id test -------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
diff --git a/SYCL/DeprecatedFeatures/get_backend.cpp b/SYCL/DeprecatedFeatures/get_backend.cpp
index 9d107ce0ba..579a993b61 100644
--- a/SYCL/DeprecatedFeatures/get_backend.cpp
+++ b/SYCL/DeprecatedFeatures/get_backend.cpp
@@ -19,6 +19,7 @@ bool check(backend be) {
   case backend::level_zero:
   case backend::cuda:
   case backend::host:
+  case backend::hip:
     return true;
   default:
     return false;
diff --git a/SYCL/ESIMD/api/simd_negation_operator.cpp b/SYCL/ESIMD/api/simd_negation_operator.cpp
index 2fed6e3218..72c1438b12 100644
--- a/SYCL/ESIMD/api/simd_negation_operator.cpp
+++ b/SYCL/ESIMD/api/simd_negation_operator.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
-// UNSUPPORTED: cuda || hip_nvidia
+// UNSUPPORTED: cuda || hip
 // RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 //
diff --git a/SYCL/ESIMD/api/simd_view_copy_move_assign.cpp b/SYCL/ESIMD/api/simd_view_copy_move_assign.cpp
index ced62b0c0e..34b5a31fcd 100644
--- a/SYCL/ESIMD/api/simd_view_copy_move_assign.cpp
+++ b/SYCL/ESIMD/api/simd_view_copy_move_assign.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
-// UNSUPPORTED: cuda || hip_nvidia
+// UNSUPPORTED: cuda || hip
 // RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 //
diff --git a/SYCL/ESIMD/api/simd_view_negation_operator.cpp b/SYCL/ESIMD/api/simd_view_negation_operator.cpp
index 8f822d9ead..a8405192e1 100644
--- a/SYCL/ESIMD/api/simd_view_negation_operator.cpp
+++ b/SYCL/ESIMD/api/simd_view_negation_operator.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
-// UNSUPPORTED: cuda || hip_nvidia
+// UNSUPPORTED: cuda || hip
 // RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 //
diff --git a/SYCL/ESIMD/api/slm_gather_scatter.cpp b/SYCL/ESIMD/api/slm_gather_scatter.cpp
index 9b81432085..aa480d420e 100644
--- a/SYCL/ESIMD/api/slm_gather_scatter.cpp
+++ b/SYCL/ESIMD/api/slm_gather_scatter.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: gpu
-// UNSUPPORTED: cuda || hip_nvidia
+// UNSUPPORTED: cuda || hip
 // RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 //
diff --git a/SYCL/ESIMD/api/slm_gather_scatter_rgba.cpp b/SYCL/ESIMD/api/slm_gather_scatter_rgba.cpp
index 73d0e953ca..6ec3de3de9 100644
--- a/SYCL/ESIMD/api/slm_gather_scatter_rgba.cpp
+++ b/SYCL/ESIMD/api/slm_gather_scatter_rgba.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: gpu
-// UNSUPPORTED: cuda || hip_nvidia
+// UNSUPPORTED: cuda || hip
 // RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 //
diff --git a/SYCL/ESIMD/regression/replicate_bug.cpp b/SYCL/ESIMD/regression/replicate_bug.cpp
index e750437a70..34824e7728 100644
--- a/SYCL/ESIMD/regression/replicate_bug.cpp
+++ b/SYCL/ESIMD/regression/replicate_bug.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
-// UNSUPPORTED: cuda || hip_nvidia
+// UNSUPPORTED: cuda || hip
 // RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 //
diff --git a/SYCL/ESIMD/usm_gather_scatter_rgba.cpp b/SYCL/ESIMD/usm_gather_scatter_rgba.cpp
index 03a124db2d..263f911587 100644
--- a/SYCL/ESIMD/usm_gather_scatter_rgba.cpp
+++ b/SYCL/ESIMD/usm_gather_scatter_rgba.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
-// UNSUPPORTED: cuda || hip_nvidia
+// UNSUPPORTED: cuda || hip
 // RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 //
diff --git a/SYCL/GroupAlgorithm/SYCL2020/permute_select.cpp b/SYCL/GroupAlgorithm/SYCL2020/permute_select.cpp
index 8a65ff9f29..b0fbb35982 100644
--- a/SYCL/GroupAlgorithm/SYCL2020/permute_select.cpp
+++ b/SYCL/GroupAlgorithm/SYCL2020/permute_select.cpp
@@ -3,10 +3,6 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 //
-// Missing __spirv_SubgroupId, __spirv_SubgroupMaxSize, __spirv_SubgroupShuffle*
-// on AMD:
-// XFAIL: hip_amd
-//
 //==------------ permute_select.cpp -*- C++ -*-----------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
diff --git a/SYCL/GroupAlgorithm/SYCL2020/shift_left_right.cpp b/SYCL/GroupAlgorithm/SYCL2020/shift_left_right.cpp
index 891a0ab6ae..e3c97cac0e 100644
--- a/SYCL/GroupAlgorithm/SYCL2020/shift_left_right.cpp
+++ b/SYCL/GroupAlgorithm/SYCL2020/shift_left_right.cpp
@@ -3,10 +3,6 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 //
-// Missing __spirv_SubgroupId, __spirv_SubgroupMaxSize, __spirv_SubgroupShuffle*
-// on AMD:
-// XFAIL: hip_amd
-//
 //==------------ shift_left_right.cpp -*- C++ -*----------------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
diff --git a/SYCL/Regression/kernel_bundle_ignore_sycl_external.cpp b/SYCL/Regression/kernel_bundle_ignore_sycl_external.cpp
index 44cf661a05..672f30e5f2 100644
--- a/SYCL/Regression/kernel_bundle_ignore_sycl_external.cpp
+++ b/SYCL/Regression/kernel_bundle_ignore_sycl_external.cpp
@@ -3,7 +3,7 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 //
-// XFAIL: cuda || hip
+// XFAIL: cuda || hip_nvidia
 
 #include <CL/sycl.hpp>
 
diff --git a/SYCL/SubGroup/common.cpp b/SYCL/SubGroup/common.cpp
index 877b14fd18..2a8730e97c 100644
--- a/SYCL/SubGroup/common.cpp
+++ b/SYCL/SubGroup/common.cpp
@@ -4,9 +4,6 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 //
-// Missing __spirv_SubgroupLocalInvocationId on AMD
-// XFAIL: hip_amd
-
 //==-------------- common.cpp - SYCL sub_group common test -----*- C++ -*---==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
diff --git a/SYCL/SubGroup/generic_reduce.cpp b/SYCL/SubGroup/generic_reduce.cpp
index 9c0954ad79..c9460eb1aa 100644
--- a/SYCL/SubGroup/generic_reduce.cpp
+++ b/SYCL/SubGroup/generic_reduce.cpp
@@ -4,10 +4,6 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t_gpu.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
-//
-// Missing __spirv_SubgroupShuffleXorINTEL, __spirv_SubgroupLocalInvocationId,
-// __spirv_SubgroupShuffleINTEL, __spirv_SubgroupShuffleXorINTEL  on AMD
-// XFAIL: hip_amd
 
 #include "helper.hpp"
 #include <CL/sycl.hpp>
diff --git a/SYCL/SubGroup/sub_groups_sycl2020.cpp b/SYCL/SubGroup/sub_groups_sycl2020.cpp
index 903d81f364..3bf33e1904 100644
--- a/SYCL/SubGroup/sub_groups_sycl2020.cpp
+++ b/SYCL/SubGroup/sub_groups_sycl2020.cpp
@@ -2,10 +2,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 //
-// Missing __spirv_SubgroupLocalInvocationId on AMD
 // Assertion `!MHostPlatform && "Plugin is not available for Host."' failed on
 // Nvidia.
-// XFAIL: hip_amd || hip_nvidia
+// XFAIL: hip_nvidia
 
 #include <sycl/sycl.hpp>