diff --git a/SYCL/Assert/assert_in_kernels_ndebug.cpp b/SYCL/Assert/assert_in_kernels_ndebug.cpp
index f99b2c97eb..87aeecf7dd 100644
--- a/SYCL/Assert/assert_in_kernels_ndebug.cpp
+++ b/SYCL/Assert/assert_in_kernels_ndebug.cpp
@@ -1,5 +1,5 @@
-// FIXME unsupported on CUDA and HIP until fallback libdevice becomes available
-// UNSUPPORTED: cuda || hip
+// FIXME unsupported on HIP until fallback libdevice becomes available
+// UNSUPPORTED: hip
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -DNDEBUG %S/assert_in_kernels.cpp -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER
 // RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER
diff --git a/SYCL/GroupAlgorithm/exclusive_scan_over_group.cpp b/SYCL/GroupAlgorithm/exclusive_scan_over_group.cpp
index ac49a88b08..a3a9c1ce77 100644
--- a/SYCL/GroupAlgorithm/exclusive_scan_over_group.cpp
+++ b/SYCL/GroupAlgorithm/exclusive_scan_over_group.cpp
@@ -1,4 +1,4 @@
-// UNSUPPORTED: cuda || hip
+// UNSUPPORTED: hip
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // UNSUPPORTED: ze_debug4,ze_debug-1
diff --git a/SYCL/GroupAlgorithm/exclusive_scan_sycl2020.cpp b/SYCL/GroupAlgorithm/exclusive_scan_sycl2020.cpp
index 61725566c5..85182b977b 100644
--- a/SYCL/GroupAlgorithm/exclusive_scan_sycl2020.cpp
+++ b/SYCL/GroupAlgorithm/exclusive_scan_sycl2020.cpp
@@ -1,4 +1,4 @@
-// UNSUPPORTED: cuda || hip
+// UNSUPPORTED: hip
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-device-code-split=per_kernel %s -I . -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/GroupAlgorithm/inclusive_scan_sycl2020.cpp b/SYCL/GroupAlgorithm/inclusive_scan_sycl2020.cpp
index 1cccecdfa9..7c1b987f89 100644
--- a/SYCL/GroupAlgorithm/inclusive_scan_sycl2020.cpp
+++ b/SYCL/GroupAlgorithm/inclusive_scan_sycl2020.cpp
@@ -1,4 +1,4 @@
-// UNSUPPORTED: cuda || hip
+// UNSUPPORTED: hip
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-device-code-split=per_kernel %s -I . -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/GroupAlgorithm/reduce_sycl2020.cpp b/SYCL/GroupAlgorithm/reduce_sycl2020.cpp
index 1dc9d1bab6..8197ace2ba 100644
--- a/SYCL/GroupAlgorithm/reduce_sycl2020.cpp
+++ b/SYCL/GroupAlgorithm/reduce_sycl2020.cpp
@@ -1,4 +1,4 @@
-// UNSUPPORTED: cuda || hip
+// UNSUPPORTED: hip
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-device-code-split=per_kernel %s -I . -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/SpecConstants/2020/handler-api.cpp b/SYCL/SpecConstants/2020/handler-api.cpp
index ffe95f4fac..f9df9b82a1 100644
--- a/SYCL/SpecConstants/2020/handler-api.cpp
+++ b/SYCL/SpecConstants/2020/handler-api.cpp
@@ -13,8 +13,7 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // FIXME: ACC devices use emulation path, which is not yet supported
-// FIXME: CUDA uses emulation path, which is not yet supported
-// UNSUPPORTED: cuda || hip
+// UNSUPPORTED: hip
 
 #include <cstdlib>
 #include <iostream>
diff --git a/SYCL/SpecConstants/2020/host_apis.cpp b/SYCL/SpecConstants/2020/host_apis.cpp
index 7011113ef8..28be5a6ca1 100644
--- a/SYCL/SpecConstants/2020/host_apis.cpp
+++ b/SYCL/SpecConstants/2020/host_apis.cpp
@@ -2,7 +2,6 @@
 // RUN:          -fsycl-dead-args-optimization
 // RUN: %BE_RUN_PLACEHOLDER %t.out
 
-// UNSUPPORTED: cuda
 // UNSUPPORTED: hip
 
 #include <sycl/sycl.hpp>
diff --git a/SYCL/SpecConstants/2020/kernel-bundle-api.cpp b/SYCL/SpecConstants/2020/kernel-bundle-api.cpp
index 0894ef2dde..0278043535 100644
--- a/SYCL/SpecConstants/2020/kernel-bundle-api.cpp
+++ b/SYCL/SpecConstants/2020/kernel-bundle-api.cpp
@@ -13,8 +13,7 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // FIXME: ACC devices use emulation path, which is not yet supported
-// FIXME: CUDA uses emulation path, which is not yet supported
-// UNSUPPORTED: cuda || hip
+// UNSUPPORTED: hip
 
 #include <cstdlib>
 #include <iostream>
diff --git a/SYCL/SpecConstants/2020/non_native/cuda.cpp b/SYCL/SpecConstants/2020/non_native/cuda.cpp
index 3780f04a49..446de84c5a 100644
--- a/SYCL/SpecConstants/2020/non_native/cuda.cpp
+++ b/SYCL/SpecConstants/2020/non_native/cuda.cpp
@@ -3,8 +3,5 @@
 // RUN: %clangxx -fsycl -fsycl-targets=nvptx64-nvidia-cuda %S/Inputs/common.cpp -o %t.out
 // RUN: env SYCL_DEVICE_FILTER=cuda %t.out
 
-// TODO: enable this test then compile-time error in sycl-post-link is fixed
-// UNSUPPORTED: cuda
-
 // This test checks correctness of SYCL2020 non-native specialization constants
 // on CUDA device
diff --git a/SYCL/SpecConstants/2020/vector-convolution-demo.cpp b/SYCL/SpecConstants/2020/vector-convolution-demo.cpp
index 4a04f6956a..63732691de 100644
--- a/SYCL/SpecConstants/2020/vector-convolution-demo.cpp
+++ b/SYCL/SpecConstants/2020/vector-convolution-demo.cpp
@@ -2,7 +2,7 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
-// UNSUPPORTED: cuda || hip
+// UNSUPPORTED: hip
 
 // This test checks the spenario of using specialization constants with an
 // 'array of array' as well as a 'stuct with an array of array' types for