diff --git a/SYCL/AtomicRef/assignment_atomic64_generic.cpp b/SYCL/AtomicRef/assignment_atomic64_generic.cpp
index d426707ed9..eb0e12052e 100644
--- a/SYCL/AtomicRef/assignment_atomic64_generic.cpp
+++ b/SYCL/AtomicRef/assignment_atomic64_generic.cpp
@@ -3,8 +3,8 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA backend has had no support for the generic address space yet
-// XFAIL: cuda || hip
+// HIP backend has had no support for the generic address space yet.
+// XFAIL: hip
 
 #include "assignment.h"
 #include <iostream>
diff --git a/SYCL/AtomicRef/assignment_generic.cpp b/SYCL/AtomicRef/assignment_generic.cpp
index beb2f3bbdd..8cc6a6df43 100644
--- a/SYCL/AtomicRef/assignment_generic.cpp
+++ b/SYCL/AtomicRef/assignment_generic.cpp
@@ -3,8 +3,8 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA backend has had no support for the generic address space yet
-// XFAIL: cuda || hip
+// HIP backend has had no support for the generic address space yet
+// XFAIL: hip
 
 #include "assignment.h"
 #include <iostream>
diff --git a/SYCL/AtomicRef/compare_exchange_generic.cpp b/SYCL/AtomicRef/compare_exchange_generic.cpp
index 3b1cb8be3d..52f11473d5 100644
--- a/SYCL/AtomicRef/compare_exchange_generic.cpp
+++ b/SYCL/AtomicRef/compare_exchange_generic.cpp
@@ -3,8 +3,8 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet
-// XFAIL: cuda || hip
+// HIP backend has had no support for the generic address space yet
+// XFAIL: hip
 
 #include "compare_exchange.h"
 
diff --git a/SYCL/AtomicRef/compare_exchange_generic_local.cpp b/SYCL/AtomicRef/compare_exchange_generic_local.cpp
index 239eb020d2..82a522c604 100644
--- a/SYCL/AtomicRef/compare_exchange_generic_local.cpp
+++ b/SYCL/AtomicRef/compare_exchange_generic_local.cpp
@@ -3,8 +3,8 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
-// XFAIL: cuda || hip
+// HIP backend has had no support for the generic address space yet.
+// XFAIL: hip
 
 #define TEST_GENERIC_IN_LOCAL 1
 
diff --git a/SYCL/AtomicRef/load_generic.cpp b/SYCL/AtomicRef/load_generic.cpp
index 725eaeeb62..30395a2eb5 100644
--- a/SYCL/AtomicRef/load_generic.cpp
+++ b/SYCL/AtomicRef/load_generic.cpp
@@ -3,8 +3,8 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet
-// XFAIL: cuda || hip
+// HIP backend has had no support for the generic address space yet
+// XFAIL: hip
 
 #include "load.h"
 
diff --git a/SYCL/AtomicRef/load_generic_local.cpp b/SYCL/AtomicRef/load_generic_local.cpp
index c2bb7dfad3..0f0e419fb0 100755
--- a/SYCL/AtomicRef/load_generic_local.cpp
+++ b/SYCL/AtomicRef/load_generic_local.cpp
@@ -3,8 +3,8 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA backend has had no support for the generic address space yet.
-// XFAIL: cuda, hip
+// HIP backend has had no support for the generic address space yet.
+// XFAIL: hip
 
 #define TEST_GENERIC_IN_LOCAL 1
 
diff --git a/SYCL/AtomicRef/max_generic.cpp b/SYCL/AtomicRef/max_generic.cpp
index 93760b9913..2190cb2f36 100644
--- a/SYCL/AtomicRef/max_generic.cpp
+++ b/SYCL/AtomicRef/max_generic.cpp
@@ -3,8 +3,8 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet
-// XFAIL: cuda || hip
+// HIP backend has had no support for the generic address space yet
+// XFAIL: hip
 
 #include "max.h"
 
diff --git a/SYCL/AtomicRef/max_generic_local.cpp b/SYCL/AtomicRef/max_generic_local.cpp
index ca5c1cf9e5..891242aaf8 100644
--- a/SYCL/AtomicRef/max_generic_local.cpp
+++ b/SYCL/AtomicRef/max_generic_local.cpp
@@ -3,8 +3,8 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
-// XFAIL: cuda || hip
+// HIP backend has had no support for the generic address space yet.
+// XFAIL: hip
 
 #define TEST_GENERIC_IN_LOCAL 1
 
diff --git a/SYCL/AtomicRef/max_generic_local_native_fp.cpp b/SYCL/AtomicRef/max_generic_local_native_fp.cpp
index 1b0efcaa34..42483195cc 100644
--- a/SYCL/AtomicRef/max_generic_local_native_fp.cpp
+++ b/SYCL/AtomicRef/max_generic_local_native_fp.cpp
@@ -3,9 +3,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
+// HIP backend has had no support for the generic address space yet.
 // HIP dees not support native floating point atomics
-// XFAIL: cuda, hip
+// XFAIL: hip
 
 #define SYCL_USE_NATIVE_FP_ATOMICS
 #define FP_TESTS_ONLY
diff --git a/SYCL/AtomicRef/max_generic_native_fp.cpp b/SYCL/AtomicRef/max_generic_native_fp.cpp
index a2cc7d9185..7750e19a33 100644
--- a/SYCL/AtomicRef/max_generic_native_fp.cpp
+++ b/SYCL/AtomicRef/max_generic_native_fp.cpp
@@ -3,9 +3,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
+// HIP backend has had no support for the generic address space yet.
 // HIP does not support native floating point atomics
-// XFAIL: cuda, hip
+// XFAIL: hip
 
 #define SYCL_USE_NATIVE_FP_ATOMICS
 #define FP_TESTS_ONLY
diff --git a/SYCL/AtomicRef/min_generic.cpp b/SYCL/AtomicRef/min_generic.cpp
index eb2d653e27..eaeadee548 100644
--- a/SYCL/AtomicRef/min_generic.cpp
+++ b/SYCL/AtomicRef/min_generic.cpp
@@ -3,8 +3,8 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet
-// XFAIL: cuda || hip
+// HIP backend has had no support for the generic address space yet
+// XFAIL: hip
 
 #include "min.h"
 
diff --git a/SYCL/AtomicRef/min_generic_local.cpp b/SYCL/AtomicRef/min_generic_local.cpp
index 7acae0ae9f..0033f21795 100644
--- a/SYCL/AtomicRef/min_generic_local.cpp
+++ b/SYCL/AtomicRef/min_generic_local.cpp
@@ -3,8 +3,8 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
-// XFAIL: cuda || hip
+// HIP backend has had no support for the generic address space yet
+// XFAIL: hip
 
 #define TEST_GENERIC_IN_LOCAL 1
 
diff --git a/SYCL/AtomicRef/min_generic_local_native_fp.cpp b/SYCL/AtomicRef/min_generic_local_native_fp.cpp
index 07d56de447..f1006bad93 100644
--- a/SYCL/AtomicRef/min_generic_local_native_fp.cpp
+++ b/SYCL/AtomicRef/min_generic_local_native_fp.cpp
@@ -3,9 +3,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
+// HIP backend has had no support for the generic address space yet.
 // HIP does not support native floating point atomics
-// XFAIL: cuda, hip
+// XFAIL: hip
 
 #define SYCL_USE_NATIVE_FP_ATOMICS
 #define FP_TESTS_ONLY
diff --git a/SYCL/AtomicRef/min_generic_native_fp.cpp b/SYCL/AtomicRef/min_generic_native_fp.cpp
index 96125a5e2b..c116f36c3f 100644
--- a/SYCL/AtomicRef/min_generic_native_fp.cpp
+++ b/SYCL/AtomicRef/min_generic_native_fp.cpp
@@ -3,9 +3,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have had no support for the generic address space yet.
+// HIP backend has had no support for the generic address space yet.
 // HIP does not support native floating point atomics
-// XFAIL: cuda, hip
+// XFAIL: hip
 
 #define SYCL_USE_NATIVE_FP_ATOMICS
 #define FP_TESTS_ONLY
diff --git a/SYCL/AtomicRef/store_generic.cpp b/SYCL/AtomicRef/store_generic.cpp
index 88f0a8cb14..dfd86e341a 100644
--- a/SYCL/AtomicRef/store_generic.cpp
+++ b/SYCL/AtomicRef/store_generic.cpp
@@ -3,8 +3,8 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have no support for the generic address space yet
-// XFAIL: cuda, hip
+// HIP backend has no support for the generic address space yet
+// XFAIL: hip
 
 #include "store.h"
 
diff --git a/SYCL/AtomicRef/store_generic_local.cpp b/SYCL/AtomicRef/store_generic_local.cpp
index 9158e1ed4a..8b0f043b24 100755
--- a/SYCL/AtomicRef/store_generic_local.cpp
+++ b/SYCL/AtomicRef/store_generic_local.cpp
@@ -3,8 +3,8 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// CUDA and HIP backends have no support for the generic address space yet.
-// XFAIL: cuda, hip
+// HIP backend has no support for the generic address space yet
+// XFAIL: hip
 
 #define TEST_GENERIC_IN_LOCAL 1