diff --git a/sycl/test-e2e/Basic/buffer/buffer_full_copy.cpp b/sycl/test-e2e/Basic/buffer/buffer_full_copy.cpp
index 30eb964c26017..5e97e64eeafc0 100644
--- a/sycl/test-e2e/Basic/buffer/buffer_full_copy.cpp
+++ b/sycl/test-e2e/Basic/buffer/buffer_full_copy.cpp
@@ -1,8 +1,8 @@
 // RUN: %{build} -o %t2.out
 // RUN: %{run} %t2.out
 
-// XFAIL: run-mode && arch-intel_gpu_pvc && !igc-dev
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/19585
+// UNSUPPORTED: run-mode && arch-intel_gpu_pvc && !igc-dev
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/19585
 
 //==------------- buffer_full_copy.cpp - SYCL buffer basic test ------------==//
 //
diff --git a/sycl/test-e2e/Basic/fill_accessor.cpp b/sycl/test-e2e/Basic/fill_accessor.cpp
index c72db56484b82..fac85437379b9 100644
--- a/sycl/test-e2e/Basic/fill_accessor.cpp
+++ b/sycl/test-e2e/Basic/fill_accessor.cpp
@@ -1,11 +1,11 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-// XFAIL: run-mode && arch-intel_gpu_pvc && !igc-dev
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/19585
+// UNSUPPORTED: run-mode && arch-intel_gpu_pvc && !igc-dev
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/19585
 
-// XFAIL: run-mode && linux && arch-intel_gpu_bmg_g21 && !spirv-backend
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/19586
+// UNSUPPORTED: run-mode && linux && arch-intel_gpu_bmg_g21 && !spirv-backend
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/19586
 
 #include <sycl/detail/core.hpp>
 
diff --git a/sycl/test-e2e/Basic/fill_accessor_ur.cpp b/sycl/test-e2e/Basic/fill_accessor_ur.cpp
index fd0ae80c34cf6..e632948eee65c 100644
--- a/sycl/test-e2e/Basic/fill_accessor_ur.cpp
+++ b/sycl/test-e2e/Basic/fill_accessor_ur.cpp
@@ -1,8 +1,8 @@
 // RUN: %{build} -o %t.out
 // RUN: env SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s
 
-// XFAIL: run-mode && arch-intel_gpu_pvc && !igc-dev
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/19585
+// UNSUPPORTED: run-mode && arch-intel_gpu_pvc && !igc-dev
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/19585
 
 // This test merely checks the use of the correct UR call. Its sister test
 // fill_accessor.cpp thoroughly checks the workings of the .fill() call.
diff --git a/sycl/test-e2e/Basic/handler/handler_mem_op.cpp b/sycl/test-e2e/Basic/handler/handler_mem_op.cpp
index 329b74a4ac4a3..a323d71b95548 100644
--- a/sycl/test-e2e/Basic/handler/handler_mem_op.cpp
+++ b/sycl/test-e2e/Basic/handler/handler_mem_op.cpp
@@ -1,8 +1,8 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-// XFAIL: run-mode && arch-intel_gpu_pvc && !igc-dev
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/19585
+// UNSUPPORTED: run-mode && arch-intel_gpu_pvc && !igc-dev
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/19585
 
 //==- handler.cpp - SYCL handler explicit memory operations test -*- C++-*--==//
 //
diff --git a/sycl/test-e2e/Basic/queue/queue_shortcut_functions.cpp b/sycl/test-e2e/Basic/queue/queue_shortcut_functions.cpp
index 8fb391a148c82..3d9e3bcef1d54 100644
--- a/sycl/test-e2e/Basic/queue/queue_shortcut_functions.cpp
+++ b/sycl/test-e2e/Basic/queue/queue_shortcut_functions.cpp
@@ -1,8 +1,8 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-// XFAIL: run-mode && arch-intel_gpu_pvc && !igc-dev
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/19585
+// UNSUPPORTED: run-mode && arch-intel_gpu_pvc && !igc-dev
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/19585
 
 //==-- queue_shortcut_functions.cpp - SYCL queue shortcut functions test ---==//
 //
diff --git a/sycl/test-e2e/KernelAndProgram/kernel-bundle-get-kernel-ids.cpp b/sycl/test-e2e/KernelAndProgram/kernel-bundle-get-kernel-ids.cpp
index fd3cc8b2f9975..3d09a4e1ea710 100644
--- a/sycl/test-e2e/KernelAndProgram/kernel-bundle-get-kernel-ids.cpp
+++ b/sycl/test-e2e/KernelAndProgram/kernel-bundle-get-kernel-ids.cpp
@@ -5,8 +5,8 @@
 // in the source regardless of whether they are expressed as lambdas,
 // function objects or free functions.
 //
-// XFAIL: ((intel_gpu_acm{{.*}} || intel_gpu_pvc || intel_gpu_bmg{{.*}} || cuda || hip) && (!level_zero)) || preview-mode
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/19423
+// UNSUPPORTED: ((intel_gpu_acm{{.*}} || intel_gpu_pvc || intel_gpu_bmg{{.*}} || cuda || hip) && (!level_zero)) || preview-mode
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/19423
 
 #include <sycl/detail/core.hpp>
 #include <sycl/ext/oneapi/experimental/free_function_traits.hpp>
diff --git a/sycl/test-e2e/MemorySanitizer/track-origins/check_host_usm.cpp b/sycl/test-e2e/MemorySanitizer/track-origins/check_host_usm.cpp
index aee8ef73592a4..37673d22afdb3 100644
--- a/sycl/test-e2e/MemorySanitizer/track-origins/check_host_usm.cpp
+++ b/sycl/test-e2e/MemorySanitizer/track-origins/check_host_usm.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: linux, cpu || (gpu && level_zero)
-// XFAIL: run-mode && arch-intel_gpu_pvc && !igc-dev
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/19585
+// UNSUPPORTED: run-mode && arch-intel_gpu_pvc && !igc-dev
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/19585
 
 // RUN: %{build} %device_msan_flags -Xarch_device -fsanitize-memory-track-origins=1 -O0 -g -o %t1.out
 // RUN: env UR_LAYER_MSAN_OPTIONS=msan_check_host_and_shared_usm:1 %{run} %t1.out 2>&1 | FileCheck %s --check-prefixes CHECK,CHECK-ORIGIN-STACK
diff --git a/sycl/test-e2e/MemorySanitizer/track-origins/check_host_usm_initialized_on_host.cpp b/sycl/test-e2e/MemorySanitizer/track-origins/check_host_usm_initialized_on_host.cpp
index 88737248c97f4..825dac89d90a4 100644
--- a/sycl/test-e2e/MemorySanitizer/track-origins/check_host_usm_initialized_on_host.cpp
+++ b/sycl/test-e2e/MemorySanitizer/track-origins/check_host_usm_initialized_on_host.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: linux, cpu || (gpu && level_zero)
-// XFAIL: run-mode && arch-intel_gpu_pvc && !igc-dev
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/19585
+// UNSUPPORTED: run-mode && arch-intel_gpu_pvc && !igc-dev
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/19585
 
 // RUN: %{build} %device_msan_flags -Xarch_device -fsanitize-memory-track-origins=1 -O0 -g -o %t0.out
 // RUN: env UR_LAYER_MSAN_OPTIONS=msan_check_host_and_shared_usm:1 %{run} %t0.out 2>&1 | FileCheck %s --check-prefixes CHECK,CHECK-ORIGIN-STACK
diff --git a/sycl/test-e2e/MemorySanitizer/track-origins/check_kernel_memcpy.cpp b/sycl/test-e2e/MemorySanitizer/track-origins/check_kernel_memcpy.cpp
index a4a57717dc5a2..cf51a6cbd46d1 100644
--- a/sycl/test-e2e/MemorySanitizer/track-origins/check_kernel_memcpy.cpp
+++ b/sycl/test-e2e/MemorySanitizer/track-origins/check_kernel_memcpy.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: linux, cpu || (gpu && level_zero)
-// XFAIL: run-mode && arch-intel_gpu_pvc && !igc-dev
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/19585
+// UNSUPPORTED: run-mode && arch-intel_gpu_pvc && !igc-dev
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/19585
 
 // RUN: %{build} %device_msan_flags -Xarch_device -fsanitize-memory-track-origins=1 -O2 -g -o %t1.out
 // RUN: env UR_LAYER_MSAN_OPTIONS=msan_check_host_and_shared_usm:1 %{run} %t1.out 2>&1 | FileCheck %s
diff --git a/sycl/test-e2e/MemorySanitizer/track-origins/check_kernel_memmove_no_overlap.cpp b/sycl/test-e2e/MemorySanitizer/track-origins/check_kernel_memmove_no_overlap.cpp
index eb1dda10642fb..3b9a852f6932d 100644
--- a/sycl/test-e2e/MemorySanitizer/track-origins/check_kernel_memmove_no_overlap.cpp
+++ b/sycl/test-e2e/MemorySanitizer/track-origins/check_kernel_memmove_no_overlap.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: linux, cpu || (gpu && level_zero)
-// XFAIL: run-mode && arch-intel_gpu_pvc && !igc-dev
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/19585
+// UNSUPPORTED: run-mode && arch-intel_gpu_pvc && !igc-dev
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/19585
 
 // RUN: %{build} %device_msan_flags -Xarch_device -fsanitize-memory-track-origins=1 -O0 -g -o %t0.out
 // RUN: env UR_LAYER_MSAN_OPTIONS=msan_check_host_and_shared_usm:1 %{run} %t0.out 2>&1 | FileCheck %s --check-prefixes CHECK,CHECK-ORIGIN-STACK
diff --git a/sycl/test-e2e/MemorySanitizer/track-origins/check_kernel_memmove_overlap.cpp b/sycl/test-e2e/MemorySanitizer/track-origins/check_kernel_memmove_overlap.cpp
index e1fbeb64076fd..b33a63ee70944 100644
--- a/sycl/test-e2e/MemorySanitizer/track-origins/check_kernel_memmove_overlap.cpp
+++ b/sycl/test-e2e/MemorySanitizer/track-origins/check_kernel_memmove_overlap.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: linux, cpu || (gpu && level_zero)
-// XFAIL: run-mode && arch-intel_gpu_pvc && !igc-dev
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/19585
+// UNSUPPORTED: run-mode && arch-intel_gpu_pvc && !igc-dev
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/19585
 
 // RUN: %{build} %device_msan_flags -Xarch_device -fsanitize-memory-track-origins=1 -O0 -g -o %t0.out
 // RUN: env UR_LAYER_MSAN_OPTIONS=msan_check_host_and_shared_usm:1 %{run} %t0.out 2>&1 | FileCheck %s --check-prefixes CHECK,CHECK-ORIGIN-STACK
diff --git a/sycl/test-e2e/MemorySanitizer/track-origins/check_shared_usm.cpp b/sycl/test-e2e/MemorySanitizer/track-origins/check_shared_usm.cpp
index c0bf176051450..afd7ad61f89ea 100644
--- a/sycl/test-e2e/MemorySanitizer/track-origins/check_shared_usm.cpp
+++ b/sycl/test-e2e/MemorySanitizer/track-origins/check_shared_usm.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: linux, cpu || (gpu && level_zero)
-// XFAIL: run-mode && arch-intel_gpu_pvc && !igc-dev
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/19585
+// UNSUPPORTED: run-mode && arch-intel_gpu_pvc && !igc-dev
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/19585
 
 // RUN: %{build} %device_msan_flags -Xarch_device -fsanitize-memory-track-origins=1 -O0 -g -o %t1.out
 // RUN: env UR_LAYER_MSAN_OPTIONS=msan_check_host_and_shared_usm:1 %{run} %t1.out 2>&1 | FileCheck %s --check-prefixes CHECK,CHECK-ORIGIN-STACK
diff --git a/sycl/test-e2e/ProfilingTag/profiling_queue.cpp b/sycl/test-e2e/ProfilingTag/profiling_queue.cpp
index 6ad8e79c41fd2..7a6db03a92241 100644
--- a/sycl/test-e2e/ProfilingTag/profiling_queue.cpp
+++ b/sycl/test-e2e/ProfilingTag/profiling_queue.cpp
@@ -23,8 +23,8 @@
 // UNSUPPORTED: level_zero_v2_adapter
 // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/19116
 //
-// XFAIL: ((intel_gpu_acm{{.*}} || intel_gpu_pvc || intel_gpu_bmg{{.*}}) && (!level_zero)) || preview-mode
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/19425
+// UNSUPPORTED: ((intel_gpu_acm{{.*}} || intel_gpu_pvc || intel_gpu_bmg{{.*}}) && (!level_zero)) || preview-mode
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/19425
 
 #include "common.hpp"