diff --git a/sycl/test-e2e/Config/config.cpp b/sycl/test-e2e/Config/config.cpp
index d446f10519c79..5f82d3fa28111 100644
--- a/sycl/test-e2e/Config/config.cpp
+++ b/sycl/test-e2e/Config/config.cpp
@@ -8,13 +8,13 @@
 // RUN: %{build} %debug_option %O0 -o %t.out
 // RUN: echo SYCL_PRINT_EXECUTION_GRAPH=always > %t.cfg
 // RUN: %{run-unfiltered-devices} env SYCL_CONFIG_FILE_NAME=%t.cfg %t.out
-// RUN: cat *.dot > /dev/null
-// RUN: rm *.dot
+// RUN: %if run-mode %{cat *.dot > /dev/null%}
+// RUN: %if run-mode %{rm *.dot%}
 // RUN: %{run-unfiltered-devices} env SYCL_PRINT_EXECUTION_GRAPH=always %t.out
-// RUN: cat *.dot > /dev/null
-// RUN: rm *.dot
+// RUN: %if run-mode %{cat *.dot > /dev/null%}
+// RUN: %if run-mode %{rm *.dot%}
 // RUN: %{run-unfiltered-devices} %t.out
-// RUN: not cat *.dot > /dev/null
+// RUN: %if run-mode %{not cat *.dot > /dev/null%}
 
 #include <sycl/detail/core.hpp>
 
diff --git a/sycl/test-e2e/ESIMD/PerformanceTests/BitonicSortK.cpp b/sycl/test-e2e/ESIMD/PerformanceTests/BitonicSortK.cpp
index 2fbcd9b5393ae..91d3449d1e74f 100644
--- a/sycl/test-e2e/ESIMD/PerformanceTests/BitonicSortK.cpp
+++ b/sycl/test-e2e/ESIMD/PerformanceTests/BitonicSortK.cpp
@@ -10,7 +10,7 @@
 
 // RUN: mkdir -p %t.dir && %{build} -o %t.dir/exec.out
 // RUN: env IGC_DumpToCustomDir=%t.dir IGC_ShaderDumpEnable=1 %{run} %t.dir/exec.out
-// RUN: python3 %S/instruction_count.py %t.dir 2914 ZTSZZN11BitonicSort5SolveEPjS0_jENKUlRN4sycl3_V17handlerEE0_clES4_E5Merge.asm
-// RUN: echo "Baseline from driver version 1.3.30872"
+// RUN: %if run-mode %{python3 %S/instruction_count.py %t.dir 2914 ZTSZZN11BitonicSort5SolveEPjS0_jENKUlRN4sycl3_V17handlerEE0_clES4_E5Merge.asm%}
+// RUN: %if run-mode %{echo "Baseline from driver version 1.3.30872"%}
 
 #include "../BitonicSortK.cpp"
diff --git a/sycl/test-e2e/ESIMD/PerformanceTests/BitonicSortKv2.cpp b/sycl/test-e2e/ESIMD/PerformanceTests/BitonicSortKv2.cpp
index cc734ca2710e7..cbb609681a85a 100644
--- a/sycl/test-e2e/ESIMD/PerformanceTests/BitonicSortKv2.cpp
+++ b/sycl/test-e2e/ESIMD/PerformanceTests/BitonicSortKv2.cpp
@@ -10,7 +10,7 @@
 
 // RUN: mkdir -p %t.dir && %{build} -o %t.dir/exec.out
 // RUN: env IGC_DumpToCustomDir=%t.dir IGC_ShaderDumpEnable=1 %{run} %t.dir/exec.out
-// RUN: python3 %S/instruction_count.py %t.dir 2969 ZTSZZN11BitonicSort5SolveEPjS0_jENKUlRN4sycl3_V17handlerEE0_clES4_E5Merge.asm
-// RUN: echo "Baseline from driver version 1.3.30872"
+// RUN: %if run-mode %{python3 %S/instruction_count.py %t.dir 2969 ZTSZZN11BitonicSort5SolveEPjS0_jENKUlRN4sycl3_V17handlerEE0_clES4_E5Merge.asm%}
+// RUN: %if run-mode %{echo "Baseline from driver version 1.3.30872"%}
 
 #include "../BitonicSortKv2.cpp"
diff --git a/sycl/test-e2e/ESIMD/PerformanceTests/Stencil.cpp b/sycl/test-e2e/ESIMD/PerformanceTests/Stencil.cpp
index 18198c14cc71c..42d906545207c 100644
--- a/sycl/test-e2e/ESIMD/PerformanceTests/Stencil.cpp
+++ b/sycl/test-e2e/ESIMD/PerformanceTests/Stencil.cpp
@@ -10,7 +10,7 @@
 
 // RUN: mkdir -p %t.dir && %{build} -o %t.dir/exec.out
 // RUN: env IGC_DumpToCustomDir=%t.dir IGC_ShaderDumpEnable=1 %{run} %t.dir/exec.out
-// RUN: python3 %S/instruction_count.py %t.dir 1699 ZTSZZ4mainENKUlRN4sycl3_V17handlerEE_clES2_E14Stencil_kernel.asm
-// RUN: echo "Baseline from driver version 1.3.29138"
+// RUN: %if run-mode %{python3 %S/instruction_count.py %t.dir 1699 ZTSZZ4mainENKUlRN4sycl3_V17handlerEE_clES2_E14Stencil_kernel.asm%}
+// RUN: %if run-mode %{echo "Baseline from driver version 1.3.29138"%}
 
-#include "../Stencil.cpp"
\ No newline at end of file
+#include "../Stencil.cpp"
diff --git a/sycl/test-e2e/ESIMD/PerformanceTests/invoke_simd_smoke.cpp b/sycl/test-e2e/ESIMD/PerformanceTests/invoke_simd_smoke.cpp
index 4ce76629d9d0d..97c2bf718a1cc 100644
--- a/sycl/test-e2e/ESIMD/PerformanceTests/invoke_simd_smoke.cpp
+++ b/sycl/test-e2e/ESIMD/PerformanceTests/invoke_simd_smoke.cpp
@@ -10,7 +10,7 @@
 
 // RUN: mkdir -p %t.dir && %{build} -fsycl -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr -o %t.dir/exec.out
 // RUN: env  IGC_VCSaveStackCallLinkage=1 IGC_VCDirectCallsOnly=1 IGC_DumpToCustomDir=%t.dir IGC_ShaderDumpEnable=1 %{run} %t.dir/exec.out
-// RUN: python3 %S/instruction_count.py %t.dir 149 _simd16_entry_0001.asm
-// RUN: echo "Baseline from driver version 1.3.29735"
+// RUN: %if run-mode %{python3 %S/instruction_count.py %t.dir 149 _simd16_entry_0001.asm%}
+// RUN: %if run-mode %{echo "Baseline from driver version 1.3.29735"%}
 
-#include "../../InvokeSimd/invoke_simd_smoke.cpp"
\ No newline at end of file
+#include "../../InvokeSimd/invoke_simd_smoke.cpp"
diff --git a/sycl/test-e2e/ESIMD/PerformanceTests/matrix_transpose.cpp b/sycl/test-e2e/ESIMD/PerformanceTests/matrix_transpose.cpp
index 2d44ffe3746fe..3b5db73fb611c 100644
--- a/sycl/test-e2e/ESIMD/PerformanceTests/matrix_transpose.cpp
+++ b/sycl/test-e2e/ESIMD/PerformanceTests/matrix_transpose.cpp
@@ -10,7 +10,7 @@
 
 // RUN: mkdir -p %t.dir && %{build} -o %t.dir/exec.out
 // RUN: env IGC_DumpToCustomDir=%t.dir IGC_ShaderDumpEnable=1 %{run} %t.dir/exec.out
-// RUN: python3 %S/instruction_count.py %t.dir %if igc-dev %{ 1059 %} %else %{ 1116 %} ZTSZZ7runTestjjjRdS_ENKUlRN4sycl3_V17handlerEE_clES3_E3K16.asm
-// RUN: echo "Baseline from driver version 1.3.30872"
+// RUN: %if run-mode %{python3 %S/instruction_count.py %t.dir %if igc-dev %{ 1059 %} %else %{ 1116 %} ZTSZZ7runTestjjjRdS_ENKUlRN4sycl3_V17handlerEE_clES3_E3K16.asm%}
+// RUN: %if run-mode %{echo "Baseline from driver version 1.3.30872"%}
 
 #include "../matrix_transpose.cpp"
diff --git a/sycl/test-e2e/ESIMD/PerformanceTests/stencil2.cpp b/sycl/test-e2e/ESIMD/PerformanceTests/stencil2.cpp
index 8857d286eee42..e306889c9c4b6 100644
--- a/sycl/test-e2e/ESIMD/PerformanceTests/stencil2.cpp
+++ b/sycl/test-e2e/ESIMD/PerformanceTests/stencil2.cpp
@@ -10,7 +10,7 @@
 
 // RUN: mkdir -p %t.dir && %{build} -o %t.dir/exec.out
 // RUN: env IGC_DumpToCustomDir=%t.dir IGC_ShaderDumpEnable=1 %{run} %t.dir/exec.out
-// RUN: python3 %S/instruction_count.py %t.dir 1699 ZTSZZ4mainENKUlRN4sycl3_V17handlerEE_clES2_E14Stencil_kernel.asm
-// RUN: echo "Baseline from driver version 1.3.29138"
+// RUN: %if run-mode %{python3 %S/instruction_count.py %t.dir 1699 ZTSZZ4mainENKUlRN4sycl3_V17handlerEE_clES2_E14Stencil_kernel.asm%}
+// RUN: %if run-mode %{echo "Baseline from driver version 1.3.29138"%}
 
-#include "../stencil2.cpp"
\ No newline at end of file
+#include "../stencil2.cpp"
diff --git a/sycl/test-e2e/ESIMD/preemption.cpp b/sycl/test-e2e/ESIMD/preemption.cpp
index 4e6a27f5d5d29..30c11306c08ca 100644
--- a/sycl/test-e2e/ESIMD/preemption.cpp
+++ b/sycl/test-e2e/ESIMD/preemption.cpp
@@ -9,7 +9,7 @@
 // UNSUPPORTED: gpu-intel-dg2 || arch-intel_gpu_pvc
 // RUN: %{build} -o %t.out
 // RUN: env IGC_DumpToCustomDir=%t.dump IGC_ShaderDumpEnable=1 %{run} %t.out
-// RUN: grep enablePreemption %t.dump/*.asm
+// RUN: %if run-mode %{grep enablePreemption %t.dump/*.asm%}
 
 // The test expects to see "enablePreemption" switch in the compilation
 // switches. It fails if does not find it.
diff --git a/sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp b/sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp
index bea437200bdba..efcd905f163f5 100644
--- a/sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp
+++ b/sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp
@@ -1,7 +1,7 @@
 // Don't use normal %{run} as we need to control cache directory removal and
 // cannot do that reliably when number of devices is unknown.
 //
-// REQUIRES: level_zero, ocloc
+// REQUIRES: level_zero, ocloc, run-mode
 //
 // DEFINE: %{cache_vars} = env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_TRACE=1 SYCL_CACHE_DIR=%t/cache_dir
 // DEFINE: %{build_cmd} = %{build}
diff --git a/sycl/test-e2e/KernelAndProgram/trace_kernel_program_cache.cpp b/sycl/test-e2e/KernelAndProgram/trace_kernel_program_cache.cpp
index 447ec12200ade..f9db1b97440a4 100644
--- a/sycl/test-e2e/KernelAndProgram/trace_kernel_program_cache.cpp
+++ b/sycl/test-e2e/KernelAndProgram/trace_kernel_program_cache.cpp
@@ -6,12 +6,12 @@
 // or SYCL_CACHE_TRACE is set to 0.
 
 // RUN: env SYCL_CACHE_IN_MEM=0 %{run} %t.out 2> %t.trace1
-// RUN: FileCheck --allow-empty --input-file=%t.trace1 --implicit-check-not "In-Memory Cache" %s
+// RUN: %if run-mode %{ FileCheck --allow-empty --input-file=%t.trace1 --implicit-check-not "In-Memory Cache" %s %}
 // RUN: env SYCL_CACHE_TRACE=0 %{run} %t.out 2> %t.trace2
-// RUN: FileCheck --allow-empty --input-file=%t.trace2 --implicit-check-not "In-Memory Cache" %s
+// RUN: %if run-mode %{ FileCheck --allow-empty --input-file=%t.trace2 --implicit-check-not "In-Memory Cache" %s %}
 
 // RUN: env SYCL_CACHE_TRACE=2 %{run} %t.out 2> %t.trace3
-// RUN: FileCheck %s --input-file=%t.trace3 --check-prefix=CHECK-CACHE-TRACE
+// RUN: %if run-mode %{ FileCheck %s --input-file=%t.trace3 --check-prefix=CHECK-CACHE-TRACE %}
 
 #include <sycl/detail/core.hpp>
 
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"