diff --git a/sycl/test-e2e/KernelAndProgram/cache_env_vars.cpp b/sycl/test-e2e/KernelAndProgram/cache_env_vars.cpp
index f313c92a9c0ed..1d27519f1868c 100644
--- a/sycl/test-e2e/KernelAndProgram/cache_env_vars.cpp
+++ b/sycl/test-e2e/KernelAndProgram/cache_env_vars.cpp
@@ -1,7 +1,7 @@
 // No JITing for host devices.
 // REQUIRES: opencl || level_zero
-// XFAIL: run-mode && linux && gpu-intel-dg2
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18416
+// UNSUPPORTED: run-mode && linux && gpu-intel-dg2
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/18416
 // RUN: %{run-aux} rm -rf %t/cache_dir
 // RUN: %{build} -o %t.out -DTARGET_IMAGE=INC100
 // Build program and add item to cache
diff --git a/sycl/test-e2e/KernelAndProgram/cache_env_vars_lin.cpp b/sycl/test-e2e/KernelAndProgram/cache_env_vars_lin.cpp
index 17cc92e1ea26d..cddf24180e0a3 100644
--- a/sycl/test-e2e/KernelAndProgram/cache_env_vars_lin.cpp
+++ b/sycl/test-e2e/KernelAndProgram/cache_env_vars_lin.cpp
@@ -1,8 +1,8 @@
 // No JITing for host devices and diffrent environment variables on linux and
 // windows.
 // REQUIRES: (level_zero || opencl) && linux
-// XFAIL: run-mode && linux && gpu-intel-dg2
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18416
+// UNSUPPORTED: run-mode && linux && gpu-intel-dg2
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/18416
 // RUN: %{run-aux} rm -rf %t/cache_dir
 // RUN: %{build} -o %t.out -DTARGET_IMAGE=INC100
 
diff --git a/sycl/test-e2e/KernelCompiler/opencl.cpp b/sycl/test-e2e/KernelCompiler/opencl.cpp
index 70b589caf023d..68e7c35d4f7ed 100644
--- a/sycl/test-e2e/KernelCompiler/opencl.cpp
+++ b/sycl/test-e2e/KernelCompiler/opencl.cpp
@@ -7,8 +7,8 @@
 //===----------------------------------------------------------------------===//
 
 // REQUIRES: ocloc && (opencl || level_zero)
-// XFAIL: run-mode && linux && gpu-intel-dg2
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18416
+// UNSUPPORTED: run-mode && linux && gpu-intel-dg2
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/18416
 // UNSUPPORTED: accelerator
 // UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there.
 
diff --git a/sycl/test-e2e/KernelCompiler/sycl_cache_pm.cpp b/sycl/test-e2e/KernelCompiler/sycl_cache_pm.cpp
index 252d6fb9ab44f..a13c4ea1d75ac 100644
--- a/sycl/test-e2e/KernelCompiler/sycl_cache_pm.cpp
+++ b/sycl/test-e2e/KernelCompiler/sycl_cache_pm.cpp
@@ -8,8 +8,8 @@
 
 // REQUIRES: (opencl || level_zero)
 // REQUIRES: aspect-usm_device_allocations
-// XFAIL: run-mode && linux && gpu-intel-dg2
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18416
+// UNSUPPORTED: run-mode && linux && gpu-intel-dg2
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/18416
 // UNSUPPORTED: accelerator
 // UNSUPPORTED-INTENDED: while accelerator is AoT only, this cannot run there.