diff --git a/SYCL/AtomicRef/add_local.cpp b/SYCL/AtomicRef/add_local.cpp
index a307a98008..217d1707e5 100644
--- a/SYCL/AtomicRef/add_local.cpp
+++ b/SYCL/AtomicRef/add_local.cpp
@@ -3,9 +3,6 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// HIP does not support floating point atomics.
-// XFAIL: hip
-
 #include "add.h"
 
 int main() { add_test_all<access::address_space::local_space>(); }
diff --git a/SYCL/AtomicRef/device_has_aspect_atomic64_cuda_and_hip.cpp b/SYCL/AtomicRef/device_has_aspect_atomic64_cuda_and_hip.cpp
index 7d5092178e..1aa48eb675 100644
--- a/SYCL/AtomicRef/device_has_aspect_atomic64_cuda_and_hip.cpp
+++ b/SYCL/AtomicRef/device_has_aspect_atomic64_cuda_and_hip.cpp
@@ -2,9 +2,6 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
-// XFAIL: hip
-// Expected failure because hip does not have atomic64 check implementation
-
 #include <CL/sycl.hpp>
 #include <iostream>
 
diff --git a/SYCL/AtomicRef/device_has_aspect_atomic64_level_zero.cpp b/SYCL/AtomicRef/device_has_aspect_atomic64_level_zero.cpp
index 3a461ade8d..06557c7179 100644
--- a/SYCL/AtomicRef/device_has_aspect_atomic64_level_zero.cpp
+++ b/SYCL/AtomicRef/device_has_aspect_atomic64_level_zero.cpp
@@ -1,3 +1,5 @@
+// FIXME flaky fail
+// UNSUPPORTED: level_zero
 // REQUIRES: level_zero, level_zero_dev_kit
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %level_zero_options
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/AtomicRef/min_local.cpp b/SYCL/AtomicRef/min_local.cpp
index 3cd7478108..17f2a07284 100644
--- a/SYCL/AtomicRef/min_local.cpp
+++ b/SYCL/AtomicRef/min_local.cpp
@@ -3,9 +3,6 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// HIP does not support floating point atomics.
-// XFAIL: hip
-
 #include "min.h"
 
 int main() { min_test_all<access::address_space::local_space>(); }
diff --git a/SYCL/AtomicRef/sub_local.cpp b/SYCL/AtomicRef/sub_local.cpp
index e36116e739..7b416bf722 100644
--- a/SYCL/AtomicRef/sub_local.cpp
+++ b/SYCL/AtomicRef/sub_local.cpp
@@ -3,9 +3,6 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// HIP does not support floating point atomics.
-// XFAIL: hip
-
 #include "sub.h"
 
 int main() { sub_test_all<access::address_space::local_space>(); }