diff --git a/SYCL/KernelAndProgram/build-log.cpp b/SYCL/KernelAndProgram/build-log.cpp
index a5aa6c8c1a..cbb8560c04 100644
--- a/SYCL/KernelAndProgram/build-log.cpp
+++ b/SYCL/KernelAndProgram/build-log.cpp
@@ -1,5 +1,4 @@
 // XFAIL: cuda || hip
-// UNSUPPORTED: ze_debug-1,ze_debug4
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -DGPU %s -o %t_gpu.out
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/KernelAndProgram/cache-build-result.cpp b/SYCL/KernelAndProgram/cache-build-result.cpp
index 607e89f6fb..d9458ec16b 100644
--- a/SYCL/KernelAndProgram/cache-build-result.cpp
+++ b/SYCL/KernelAndProgram/cache-build-result.cpp
@@ -4,7 +4,6 @@
 // RUN: env SYCL_CACHE_PERSISTENT=1 %GPU_RUN_PLACEHOLDER %t_gpu.out
 // RUN: env SYCL_CACHE_PERSISTENT=1 %ACC_RUN_PLACEHOLDER %t.out
 // XFAIL: cuda || hip
-// UNSUPPORTED: ze_debug-1,ze_debug4
 #include <CL/sycl.hpp>
 
 SYCL_EXTERNAL
diff --git a/SYCL/KernelAndProgram/undefined-symbol.cpp b/SYCL/KernelAndProgram/undefined-symbol.cpp
index 4b9adbd71b..1cae63c1cd 100644
--- a/SYCL/KernelAndProgram/undefined-symbol.cpp
+++ b/SYCL/KernelAndProgram/undefined-symbol.cpp
@@ -1,5 +1,4 @@
-// XFAIL: cuda || hip
-// UNSUPPORTED: host,ze_debug-1,ze_debug4
+// XFAIL: cuda || hip || (opencl && gpu)
 // RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out