diff --git a/sycl/test-e2e/Basic/fpga_tests/fpga_pipes_mixed_usage.cpp b/sycl/test-e2e/Basic/fpga_tests/fpga_pipes_mixed_usage.cpp
index a9817fab44397..4986826b27529 100644
--- a/sycl/test-e2e/Basic/fpga_tests/fpga_pipes_mixed_usage.cpp
+++ b/sycl/test-e2e/Basic/fpga_tests/fpga_pipes_mixed_usage.cpp
@@ -9,7 +9,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-// XFAIL: *
+// XFAIL: run-mode
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/13887
 // If users need to use host pipe feature provided by experimental::pipe, all
 // pipes in their design should use the experimental::pipe (as a workround).
diff --git a/sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp b/sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp
index 76a6a54671061..488e9caa7e280 100644
--- a/sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp
+++ b/sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: arch-intel_gpu_pvc, ocloc
 
-// XFAIL: arch-intel_gpu_pvc
+// XFAIL: arch-intel_gpu_pvc, run-mode
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/14826
 
 // RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_pvc %s -o %t.out
diff --git a/sycl/test-e2e/ESIMD/assert.cpp b/sycl/test-e2e/ESIMD/assert.cpp
index 693694c21a007..78d8d9bca986a 100644
--- a/sycl/test-e2e/ESIMD/assert.cpp
+++ b/sycl/test-e2e/ESIMD/assert.cpp
@@ -6,7 +6,7 @@
 //
 // The test still fails after GPU driver update on Linux. Temporary marking it
 // as expected to fail, whilst it is being investigated, see intel/llvm#11359
-// XFAIL: linux
+// XFAIL: linux && run-mode
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/11359
 //
 // Hanging on gen12, remove when internal tracker fixed
diff --git a/sycl/test-e2e/ESIMD/group_barrier.cpp b/sycl/test-e2e/ESIMD/group_barrier.cpp
index 623b49bdab9a8..de0d196a5e309 100644
--- a/sycl/test-e2e/ESIMD/group_barrier.cpp
+++ b/sycl/test-e2e/ESIMD/group_barrier.cpp
@@ -8,7 +8,7 @@
 // REQUIRES: arch-intel_gpu_pvc || gpu-intel-dg2
 // REQUIRES-INTEL-DRIVER: lin: 31155
 
-// XFAIL: linux && gpu-intel-dg2
+// XFAIL: linux && gpu-intel-dg2 && run-mode
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/15812
 
 // RUN: %{build} -o %t.out
diff --git a/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp b/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp
index c894a2d42ace4..1e0140611389f 100644
--- a/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp
@@ -6,7 +6,7 @@
 // RUN: %{run} %t.out
 // The test is failing when writing directly to output buffer.
 // If temporary variable is used (see TO_PASS mode) the test succeeded.
-// XFAIL: gpu
+// XFAIL: gpu && run-mode
 #include "include/asmhelper.h"
 #include <iostream>
 #include <vector>
diff --git a/sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/invoke_simd_struct.cpp b/sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/invoke_simd_struct.cpp
index 43a776fcee3c8..74b82dfc85ddc 100644
--- a/sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/invoke_simd_struct.cpp
+++ b/sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/invoke_simd_struct.cpp
@@ -1,6 +1,6 @@
 // TODO: Passing/returning structures via invoke_simd() API is not implemented
 // in GPU driver yet. Enable the test when GPU RT supports it.
-// XFAIL: gpu
+// XFAIL: gpu && run-mode
 //
 // RUN: %{build} -DIMPL_SUBGROUP -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr -o %t.out
 // RUN: env IGC_VCSaveStackCallLinkage=1 IGC_VCDirectCallsOnly=1 %{run} %t.out
diff --git a/sycl/test-e2e/InvokeSimd/Feature/invoke_simd_struct.cpp b/sycl/test-e2e/InvokeSimd/Feature/invoke_simd_struct.cpp
index 75bd87d74d0f3..014027460301c 100644
--- a/sycl/test-e2e/InvokeSimd/Feature/invoke_simd_struct.cpp
+++ b/sycl/test-e2e/InvokeSimd/Feature/invoke_simd_struct.cpp
@@ -1,6 +1,6 @@
 // TODO: Passing/returning structures via invoke_simd() API is not implemented
 // in GPU driver yet. Enable the test when GPU RT supports it.
-// XFAIL: gpu
+// XFAIL: gpu, run-mode
 //
 // RUN: %{build} -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr -o %t.out
 // RUN: env IGC_VCSaveStackCallLinkage=1 IGC_VCDirectCallsOnly=1 %{run} %t.out
diff --git a/sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp b/sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp
index a10810bf4549c..0c3b778457036 100644
--- a/sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp
+++ b/sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp
@@ -11,7 +11,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-// XFAIL:*
+// XFAIL: run-mode
 
 #include "../common.hpp"
 
diff --git a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/joint_matrix_colA_rowB_colC.cpp b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/joint_matrix_colA_rowB_colC.cpp
index 3ce16e94a40ba..c074a958111cd 100644
--- a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/joint_matrix_colA_rowB_colC.cpp
+++ b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/joint_matrix_colA_rowB_colC.cpp
@@ -11,7 +11,7 @@
 // RUN: %{build} -D__SPIRV_USE_COOPERATIVE_MATRIX -o %t.out
 // RUN: %{run} %t.out
 
-// XFAIL:*
+// XFAIL: run-mode
 
 #include "../../common.hpp"
 
diff --git a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_colA_rowB_colC.cpp b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_colA_rowB_colC.cpp
index 083b7cbed8ef7..db9da532d6539 100644
--- a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_colA_rowB_colC.cpp
+++ b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_colA_rowB_colC.cpp
@@ -10,7 +10,7 @@
 // RUN: %{build} -D__SPIRV_USE_COOPERATIVE_MATRIX -o %t.out
 // RUN: %{run} %t.out
 
-// XFAIL:*
+// XFAIL: run-mode
 
 #include "../common.hpp"
 
diff --git a/sycl/test-e2e/Matrix/joint_matrix_colA_rowB_colC.cpp b/sycl/test-e2e/Matrix/joint_matrix_colA_rowB_colC.cpp
index 71e3cb6501bb6..338564207c4ac 100644
--- a/sycl/test-e2e/Matrix/joint_matrix_colA_rowB_colC.cpp
+++ b/sycl/test-e2e/Matrix/joint_matrix_colA_rowB_colC.cpp
@@ -10,7 +10,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-// XFAIL:*
+// XFAIL: run-mode
 
 #include "common.hpp"
 
diff --git a/sycl/test-e2e/Plugin/level_zero_sub_sub_device.cpp b/sycl/test-e2e/Plugin/level_zero_sub_sub_device.cpp
index fd05d1071870b..3f36dd6b5ff99 100644
--- a/sycl/test-e2e/Plugin/level_zero_sub_sub_device.cpp
+++ b/sycl/test-e2e/Plugin/level_zero_sub_sub_device.cpp
@@ -1,6 +1,6 @@
 // REQUIRES:  arch-intel_gpu_pvc, level_zero
 
-// XFAIL: arch-intel_gpu_pvc
+// XFAIL: arch-intel_gpu_pvc, run-mode
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/15602
 
 // RUN: %{build} %level_zero_options -o %t.out
diff --git a/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-call.cpp b/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-call.cpp
index 8edb62e93d9b0..96ebac1c494e3 100644
--- a/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-call.cpp
+++ b/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-call.cpp
@@ -3,7 +3,7 @@
 // VTables are global variables with possibly external linkage and that causes
 // them to be copied into every module we produce during device code split
 // which in turn leads to multiple definitions error at runtime.
-// XFAIL: *
+// XFAIL: run-mode
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/15069
 //
 // This test covers a scenario where virtual functions defintion and their uses
diff --git a/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-vf-defs-and-call.cpp b/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-vf-defs-and-call.cpp
index 31c3adaf6a406..a0815f1bcaed2 100644
--- a/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-vf-defs-and-call.cpp
+++ b/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-vf-defs-and-call.cpp
@@ -5,7 +5,7 @@
 // function definitions and therefore we won't mark construct kernel as using
 // virtual functions and link operation at runtime will fail due to undefined
 // references to virtual functions from vtable.
-// XFAIL: *
+// XFAIL: run-mode
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/15071
 //
 // This test covers a scenario where virtual functions defintion and their uses
diff --git a/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-vf-defs.cpp b/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-vf-defs.cpp
index a682e2a7f15d9..ba0f2d25c9dde 100644
--- a/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-vf-defs.cpp
+++ b/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-vf-defs.cpp
@@ -5,7 +5,7 @@
 // function definitions and therefore we won't mark construct kernel as using
 // virtual functions and link operation at runtime will fail due to undefined
 // references to virtual functions from vtable.
-// XFAIL: *
+// XFAIL: run-mode
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/15071
 //
 // This test covers a scenario where virtual functions defintion and their uses
diff --git a/sycl/test-e2e/bindless_images/mipmap/mipmap_read_3D.cpp b/sycl/test-e2e/bindless_images/mipmap/mipmap_read_3D.cpp
index e269eab7d8453..2369fa1f58aea 100644
--- a/sycl/test-e2e/bindless_images/mipmap/mipmap_read_3D.cpp
+++ b/sycl/test-e2e/bindless_images/mipmap/mipmap_read_3D.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: cuda
-// XFAIL: *
+// XFAIL: run-mode
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/15727
 // RUN: %{build} -o %t.out
 // RUN: %{run-unfiltered-devices} %t.out
diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py
index ee91220fd3be3..6dfb213572b28 100644
--- a/sycl/test-e2e/lit.cfg.py
+++ b/sycl/test-e2e/lit.cfg.py
@@ -16,6 +16,9 @@
 
 # Configuration file for the 'lit' test runner.
 
+# TODO: Remove once #15728 is merged
+config.available_features.add("run-mode")
+
 # name: The name of this test suite.
 config.name = "SYCL"