diff --git a/sycl/test-e2e/Regression/2020-spec-constants-debug-info.cpp b/sycl/test-e2e/Regression/2020-spec-constants-debug-info.cpp
index b7df8195ae6ca..2490255557684 100644
--- a/sycl/test-e2e/Regression/2020-spec-constants-debug-info.cpp
+++ b/sycl/test-e2e/Regression/2020-spec-constants-debug-info.cpp
@@ -1,6 +1,6 @@
-// RUN: %clangxx -fsycl -g %s -o %t.out
-// RUN: %clangxx -fsycl -g -O0 %s -o %t.out
-// RUN: %clangxx -fsycl -g -O2 %s -o %t.out
+// RUN: %{build} -g -o %t.out
+// RUN: %{build} -g -O0 -o %t.out
+// RUN: %{build} -g -O2 -o %t.out
 //
 // The idea of this test is to make sure that we can compile the following
 // simple example without crashes/assertions firing at llvm-spirv step due to
diff --git a/sycl/test-e2e/Regression/DAE-separate-compile.cpp b/sycl/test-e2e/Regression/DAE-separate-compile.cpp
index dbc819ba46619..d4ff485d56dd8 100644
--- a/sycl/test-e2e/Regression/DAE-separate-compile.cpp
+++ b/sycl/test-e2e/Regression/DAE-separate-compile.cpp
@@ -4,11 +4,9 @@
 //
 // The test checks that the scenario works correctly.
 //
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -O2 -c -o %t.o
+// RUN: %{build} -O2 -c -o %t.o
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %t.o -O0 -o %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{run} %t.out
 
 #include <iostream>
 #include <sycl/sycl.hpp>
diff --git a/sycl/test-e2e/Regression/atomic_load.cpp b/sycl/test-e2e/Regression/atomic_load.cpp
index 4416a9b74ff00..15aaefd4a6ea8 100644
--- a/sycl/test-e2e/Regression/atomic_load.cpp
+++ b/sycl/test-e2e/Regression/atomic_load.cpp
@@ -1,7 +1,5 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 #include <sycl/sycl.hpp>
 using namespace sycl;
 
diff --git a/sycl/test-e2e/Regression/barrier_with_work.cpp b/sycl/test-e2e/Regression/barrier_with_work.cpp
index 3a39d5f0dcd38..cf40081882da5 100644
--- a/sycl/test-e2e/Regression/barrier_with_work.cpp
+++ b/sycl/test-e2e/Regression/barrier_with_work.cpp
@@ -1,8 +1,8 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.event_list.out
+// RUN: %{build} -o %t.event_list.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.event_list.out
 // RUN: env SYCL_PI_LEVEL_ZERO_USE_MULTIPLE_COMMANDLIST_BARRIERS=1 %GPU_RUN_PLACEHOLDER %t.event_list.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.event_list.out
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -DUSE_QUEUE_WIDE_BARRIER %s -o %t.queue_wide.out
+// RUN: %{build} -DUSE_QUEUE_WIDE_BARRIER -o %t.queue_wide.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.queue_wide.out
 // RUN: env SYCL_PI_LEVEL_ZERO_USE_MULTIPLE_COMMANDLIST_BARRIERS=1 %GPU_RUN_PLACEHOLDER %t.queue_wide.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.queue_wide.out
diff --git a/sycl/test-e2e/Regression/build_log.cpp b/sycl/test-e2e/Regression/build_log.cpp
index cb3bd071af8f5..cea073d67a3fa 100644
--- a/sycl/test-e2e/Regression/build_log.cpp
+++ b/sycl/test-e2e/Regression/build_log.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: gpu
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.exe
-// RUN: %GPU_RUN_PLACEHOLDER %t.exe 2> %t.out || true
+// RUN: %{build} -o %t.exe
+// RUN: %{run} %t.exe 2> %t.out || true
 
 // RUN: FileCheck %s --check-prefix=CHECK-EXPECTED-ERROR --input-file %t.out
 // CHECK-EXPECTED-ERROR: error: backend compiler failed build
diff --git a/sycl/test-e2e/Regression/cache_test.cpp b/sycl/test-e2e/Regression/cache_test.cpp
index 5c6ed75a96503..1d2255ee8885f 100644
--- a/sycl/test-e2e/Regression/cache_test.cpp
+++ b/sycl/test-e2e/Regression/cache_test.cpp
@@ -1,7 +1,6 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-
 // REQUIRES: level_zero, level_zero_dev_kit
+// RUN: %{build} %level_zero_options -o %t.out
+// RUN: %{run} %t.out
 
 #include <algorithm>
 #include <iostream>
diff --git a/sycl/test-e2e/Regression/check_vector_of_opencl_event.cpp b/sycl/test-e2e/Regression/check_vector_of_opencl_event.cpp
index b29a1916e68c8..75090c52378c0 100644
--- a/sycl/test-e2e/Regression/check_vector_of_opencl_event.cpp
+++ b/sycl/test-e2e/Regression/check_vector_of_opencl_event.cpp
@@ -1,8 +1,6 @@
 // REQUIRES: opencl
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 //
 //===----------------------------------------------------------------------===//
 // This test verifies that sycl::get_native<backend::opencl> and
diff --git a/sycl/test-e2e/Regression/commandlist/gpu.cpp b/sycl/test-e2e/Regression/commandlist/gpu.cpp
index a445c76637092..b4d25e6d58508 100644
--- a/sycl/test-e2e/Regression/commandlist/gpu.cpp
+++ b/sycl/test-e2e/Regression/commandlist/gpu.cpp
@@ -3,4 +3,4 @@
 // UNSUPPORTED: ze_debug-1,ze_debug4
 //
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %S/Inputs/FindPrimesSYCL.cpp %S/Inputs/main.cpp -o %t.out -lpthread
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{run} %t.out
diff --git a/sycl/test-e2e/Regression/complex_global_object.cpp b/sycl/test-e2e/Regression/complex_global_object.cpp
index 9d35d18fd31d2..f612f229fb8d4 100644
--- a/sycl/test-e2e/Regression/complex_global_object.cpp
+++ b/sycl/test-e2e/Regression/complex_global_object.cpp
@@ -1,7 +1,5 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 // XFAIL: gpu && linux
 
 // SYCL runtime may construct global objects at function scope. The test ensures
diff --git a/sycl/test-e2e/Regression/context_is_destroyed_after_exception.cpp b/sycl/test-e2e/Regression/context_is_destroyed_after_exception.cpp
index 11ef3cc1eddb0..f2dd328438242 100644
--- a/sycl/test-e2e/Regression/context_is_destroyed_after_exception.cpp
+++ b/sycl/test-e2e/Regression/context_is_destroyed_after_exception.cpp
@@ -1,7 +1,7 @@
 // REQUIRES: gpu
 
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
+// RUN: %{build} -o %t.out
+// RUN: env SYCL_PI_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s
 //
 // XFAIL: hip_nvidia
 
diff --git a/sycl/test-e2e/Regression/device_num.cpp b/sycl/test-e2e/Regression/device_num.cpp
index c80f5cd484629..778a3c0625f48 100644
--- a/sycl/test-e2e/Regression/device_num.cpp
+++ b/sycl/test-e2e/Regression/device_num.cpp
@@ -1,4 +1,4 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: env PRINT_FULL_DEVICE_INFO=1  %t.out > %t1.conf
 // RUN: env ONEAPI_DEVICE_SELECTOR="*:0" env TEST_DEV_CONFIG_FILE_NAME=%t1.conf %t.out
 // RUN: env ONEAPI_DEVICE_SELECTOR="*:1" env TEST_DEV_CONFIG_FILE_NAME=%t1.conf %t.out
diff --git a/sycl/test-e2e/Regression/device_pci_address_bdf_format.cpp b/sycl/test-e2e/Regression/device_pci_address_bdf_format.cpp
index 31a6361a434ff..5ab96626bb864 100644
--- a/sycl/test-e2e/Regression/device_pci_address_bdf_format.cpp
+++ b/sycl/test-e2e/Regression/device_pci_address_bdf_format.cpp
@@ -1,5 +1,6 @@
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// REQUIRES: gpu
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 //==- device_pci_address_bdf_format.cpp - SYCL PCI address BDF format test -==//
 //
diff --git a/sycl/test-e2e/Regression/dummy_event_info.cpp b/sycl/test-e2e/Regression/dummy_event_info.cpp
index 5d7f7418c637c..fe7260860a9c2 100644
--- a/sycl/test-e2e/Regression/dummy_event_info.cpp
+++ b/sycl/test-e2e/Regression/dummy_event_info.cpp
@@ -1,5 +1,6 @@
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
+// REQUIRES: cpu
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 #include <sycl/sycl.hpp>
 
diff --git a/sycl/test-e2e/Regression/event_destruction.cpp b/sycl/test-e2e/Regression/event_destruction.cpp
index 9e7ef70faf7ef..67716ef21c121 100644
--- a/sycl/test-e2e/Regression/event_destruction.cpp
+++ b/sycl/test-e2e/Regression/event_destruction.cpp
@@ -1,9 +1,7 @@
 // REQUIRES: TEMPORARY_DISABLED
 // Temporarily disabled because the test is out of time
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 //==--------------- event_destruction.cpp - SYCL event test ----------------==//
 //
diff --git a/sycl/test-e2e/Regression/fp16-with-unnamed-lambda.cpp b/sycl/test-e2e/Regression/fp16-with-unnamed-lambda.cpp
index 20212fced51fa..01b188f581bfb 100644
--- a/sycl/test-e2e/Regression/fp16-with-unnamed-lambda.cpp
+++ b/sycl/test-e2e/Regression/fp16-with-unnamed-lambda.cpp
@@ -1,8 +1,6 @@
 // REQUIRES: aspect-fp16
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 #include <sycl/sycl.hpp>
 
 #include <iostream>
diff --git a/sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp b/sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp
index 001809b880a89..e54e0bf114dea 100644
--- a/sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp
+++ b/sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp
@@ -1,7 +1,5 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-host-compiler=cl -DDEFINE_CHECK -fsycl-host-compiler-options="-DDEFINE_CHECK /std:c++17 /Zc:__cplusplus" -o %t.exe %s
-// RUN: %CPU_RUN_PLACEHOLDER %t.exe
-// RUN: %GPU_RUN_PLACEHOLDER %t.exe
-// RUN: %ACC_RUN_PLACEHOLDER %t.exe
+// RUN: %{build} -fsycl-host-compiler=cl -DDEFINE_CHECK -fsycl-host-compiler-options="-DDEFINE_CHECK /std:c++17 /Zc:__cplusplus" -o %t.exe
+// RUN: %{run} %t.exe
 // REQUIRES: windows
 //
 //==------- fsycl-host-compiler-win.cpp - external host compiler test ------==//
diff --git a/sycl/test-e2e/Regression/fsycl-host-compiler.cpp b/sycl/test-e2e/Regression/fsycl-host-compiler.cpp
index 9a50654455080..92375484109bc 100644
--- a/sycl/test-e2e/Regression/fsycl-host-compiler.cpp
+++ b/sycl/test-e2e/Regression/fsycl-host-compiler.cpp
@@ -1,7 +1,5 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-host-compiler=g++ -DDEFINE_CHECK -fsycl-host-compiler-options="-DDEFINE_CHECK -std=c++17" -o %t.out %s
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -fsycl-host-compiler=g++ -DDEFINE_CHECK -fsycl-host-compiler-options="-DDEFINE_CHECK -std=c++17" -o %t.out
+// RUN: %{run} %t.out
 // REQUIRES: linux
 //==------- fsycl-host-compiler.cpp - external host compiler test ----------==//
 //
diff --git a/sycl/test-e2e/Regression/get_spec_const_vec16.cpp b/sycl/test-e2e/Regression/get_spec_const_vec16.cpp
index ab9709a4b0c15..3c06c22766945 100644
--- a/sycl/test-e2e/Regression/get_spec_const_vec16.cpp
+++ b/sycl/test-e2e/Regression/get_spec_const_vec16.cpp
@@ -1,7 +1,5 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -o %t.out %s
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 //
 // Tests that the right value returned after setting a specialization constant
 // of sycl::vec<char, 16> type is correct.
diff --git a/sycl/test-e2e/Regression/get_subgroup_sizes.cpp b/sycl/test-e2e/Regression/get_subgroup_sizes.cpp
index 65d293871606e..4e5635a89eb9a 100644
--- a/sycl/test-e2e/Regression/get_subgroup_sizes.cpp
+++ b/sycl/test-e2e/Regression/get_subgroup_sizes.cpp
@@ -1,7 +1,5 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 //==-- get_subgroup_sizes.cpp - Test for bug fix in subgroup sizes query --==//
 //
diff --git a/sycl/test-e2e/Regression/global_queue.cpp b/sycl/test-e2e/Regression/global_queue.cpp
index 707866d904fbe..b9364a4c92df0 100644
--- a/sycl/test-e2e/Regression/global_queue.cpp
+++ b/sycl/test-e2e/Regression/global_queue.cpp
@@ -1,7 +1,5 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 // SYCL dependencies (i.e. low level runtimes) may have global objects of their
 // own. The test ensures, that those objects do not cause problems. When host
diff --git a/sycl/test-e2e/Regression/group.cpp b/sycl/test-e2e/Regression/group.cpp
index 4761751085491..6f480a23b9aea 100644
--- a/sycl/test-e2e/Regression/group.cpp
+++ b/sycl/test-e2e/Regression/group.cpp
@@ -1,7 +1,5 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 //==-- group.cpp - Regression tests for sycl::group API bug fixes. -----==//
 //
diff --git a/sycl/test-e2e/Regression/group_local_linear_id.cpp b/sycl/test-e2e/Regression/group_local_linear_id.cpp
index 49ae8a74cf242..d3562c2b25cbf 100644
--- a/sycl/test-e2e/Regression/group_local_linear_id.cpp
+++ b/sycl/test-e2e/Regression/group_local_linear_id.cpp
@@ -1,7 +1,5 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 // Checks that get_local_linear_id is the same on the nd_item as on the
 // corresponding group.
diff --git a/sycl/test-e2e/Regression/half_operators.cpp b/sycl/test-e2e/Regression/half_operators.cpp
index ad1430859234c..9e28c0e3b6f30 100644
--- a/sycl/test-e2e/Regression/half_operators.cpp
+++ b/sycl/test-e2e/Regression/half_operators.cpp
@@ -1,6 +1,6 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-device-code-split=per_kernel %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
 // REQUIRES: gpu
+// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
+// RUN: %{run} %t.out
 #include <iostream>
 #include <sycl.hpp>
 #include <vector>
diff --git a/sycl/test-e2e/Regression/host_unified_memory.cpp b/sycl/test-e2e/Regression/host_unified_memory.cpp
index 558a011f68f00..77a6fecb6c38f 100644
--- a/sycl/test-e2e/Regression/host_unified_memory.cpp
+++ b/sycl/test-e2e/Regression/host_unified_memory.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: gpu && linux
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: env SYCL_HOST_UNIFIED_MEMORY=1 %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: env SYCL_HOST_UNIFIED_MEMORY=1 %{run} %t.out
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/sycl/test-e2e/Regression/image_access.cpp b/sycl/test-e2e/Regression/image_access.cpp
index 7758d14608736..75121dcefaf9c 100644
--- a/sycl/test-e2e/Regression/image_access.cpp
+++ b/sycl/test-e2e/Regression/image_access.cpp
@@ -1,8 +1,6 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER
-// RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
-// No execution of FPGA because it does not support images
+// RUN: %{build} -o %t.out
+// RUN: env SYCL_PI_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s
 //
 // UNSUPPORTED: hip
 // CUDA doesn't fully support OpenCL spec conform images.
diff --git a/sycl/test-e2e/Regression/implicit_atomic_conversion.cpp b/sycl/test-e2e/Regression/implicit_atomic_conversion.cpp
index f2dbf6094435f..0d444e07ba487 100644
--- a/sycl/test-e2e/Regression/implicit_atomic_conversion.cpp
+++ b/sycl/test-e2e/Regression/implicit_atomic_conversion.cpp
@@ -1,7 +1,5 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 #include <sycl/sycl.hpp>
 
diff --git a/sycl/test-e2e/Regression/implicit_kernel_bundle_image_filtering.cpp b/sycl/test-e2e/Regression/implicit_kernel_bundle_image_filtering.cpp
index eee4c0055edef..ad97b70debdee 100644
--- a/sycl/test-e2e/Regression/implicit_kernel_bundle_image_filtering.cpp
+++ b/sycl/test-e2e/Regression/implicit_kernel_bundle_image_filtering.cpp
@@ -1,7 +1,5 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-device-code-split=per_kernel %s -o %t.out
-// RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER
-// RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
-// RUN: env SYCL_PI_TRACE=2 %ACC_RUN_PLACEHOLDER %t.out 2>&1 %ACC_CHECK_PLACEHOLDER
+// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
+// RUN: env SYCL_PI_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s
 
 // JIT compilation path is not taken on HIP backend.
 // UNSUPPORTED: hip
diff --git a/sycl/test-e2e/Regression/implicit_offset_debug_info.cpp b/sycl/test-e2e/Regression/implicit_offset_debug_info.cpp
index 57a662902094c..7d80579ae7849 100644
--- a/sycl/test-e2e/Regression/implicit_offset_debug_info.cpp
+++ b/sycl/test-e2e/Regression/implicit_offset_debug_info.cpp
@@ -1,6 +1,6 @@
-// RUN: %clangxx %debug_option -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
 // REQUIRES: cuda
+// RUN: %{build} %debug_option -o %t.out
+// RUN: %{run} %t.out
 
 // NOTE: Tests that the implicit global offset pass copies debug information
 
diff --git a/sycl/test-e2e/Regression/isordered.cpp b/sycl/test-e2e/Regression/isordered.cpp
index 8b55c191b481d..8d8fa28919a4b 100644
--- a/sycl/test-e2e/Regression/isordered.cpp
+++ b/sycl/test-e2e/Regression/isordered.cpp
@@ -1,7 +1,5 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUNx: %CPU_RUN_PLACEHOLDER %t.out
-// RUNx: %GPU_RUN_PLACEHOLDER %t.out
-// RUNx: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUNx: %{run} %t.out
 
 #include <sycl/sycl.hpp>
 
diff --git a/sycl/test-e2e/Regression/kernel_bundle_ignore_sycl_external.cpp b/sycl/test-e2e/Regression/kernel_bundle_ignore_sycl_external.cpp
index 0d957188a6564..cfdc9c4bdc52c 100644
--- a/sycl/test-e2e/Regression/kernel_bundle_ignore_sycl_external.cpp
+++ b/sycl/test-e2e/Regression/kernel_bundle_ignore_sycl_external.cpp
@@ -1,7 +1,5 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 //
 // XFAIL: cuda
 // UNSUPPORTED: hip
diff --git a/sycl/test-e2e/Regression/kernel_name_class.cpp b/sycl/test-e2e/Regression/kernel_name_class.cpp
index 0a85ed2d57802..eee58e89cf8bf 100644
--- a/sycl/test-e2e/Regression/kernel_name_class.cpp
+++ b/sycl/test-e2e/Regression/kernel_name_class.cpp
@@ -1,11 +1,7 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.ext.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.ext.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.ext.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.ext.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
+// RUN: %{build} -o %t.ext.out
+// RUN: %{run} %t.ext.out
 
 //==-- kernel_name_class.cpp - SYCL kernel naming variants test ------------==//
 //
diff --git a/sycl/test-e2e/Regression/kernel_unnamed.cpp b/sycl/test-e2e/Regression/kernel_unnamed.cpp
index 99f850fd3f909..994e2ff266dc2 100644
--- a/sycl/test-e2e/Regression/kernel_unnamed.cpp
+++ b/sycl/test-e2e/Regression/kernel_unnamed.cpp
@@ -1,7 +1,5 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 //==-- kernel_unnamed.cpp - SYCL kernel naming variants test ------------==//
 //
diff --git a/sycl/test-e2e/Regression/local-arg-align.cpp b/sycl/test-e2e/Regression/local-arg-align.cpp
index f37162b025b30..7210540a2d2b5 100644
--- a/sycl/test-e2e/Regression/local-arg-align.cpp
+++ b/sycl/test-e2e/Regression/local-arg-align.cpp
@@ -1,8 +1,6 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
+// RUN: %{build} -o %t.out
 //
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{run} %t.out
 
 //==-- local-arg-align.cpp - Test for local argument alignmnent ------------==//
 //
diff --git a/sycl/test-e2e/Regression/local_accessor_3d_subscript.cpp b/sycl/test-e2e/Regression/local_accessor_3d_subscript.cpp
index d07eeb52d1cfb..5f8296802640f 100644
--- a/sycl/test-e2e/Regression/local_accessor_3d_subscript.cpp
+++ b/sycl/test-e2e/Regression/local_accessor_3d_subscript.cpp
@@ -1,6 +1,7 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
+
+// UNSUPPORTED: accelerator
 
 //==------------------ local_accessor_3d_subscript.cpp ---------------------==//
 //
diff --git a/sycl/test-e2e/Regression/mad_sat.cpp b/sycl/test-e2e/Regression/mad_sat.cpp
index 6b77a22589db9..c3866d511773d 100644
--- a/sycl/test-e2e/Regression/mad_sat.cpp
+++ b/sycl/test-e2e/Regression/mad_sat.cpp
@@ -1,7 +1,5 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUNx: %CPU_RUN_PLACEHOLDER %t.out
-// RUNx: %GPU_RUN_PLACEHOLDER %t.out
-// RUNx: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUNx: %{run} %t.out
 
 #include <sycl/sycl.hpp>
 
diff --git a/sycl/test-e2e/Regression/msvc_crt.cpp b/sycl/test-e2e/Regression/msvc_crt.cpp
index 71b6e1decb676..81481b89f2eca 100644
--- a/sycl/test-e2e/Regression/msvc_crt.cpp
+++ b/sycl/test-e2e/Regression/msvc_crt.cpp
@@ -1,11 +1,7 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple /MD -o %t1.exe %s
-// RUN: %CPU_RUN_PLACEHOLDER %t1.exe
-// RUN: %GPU_RUN_PLACEHOLDER %t1.exe
-// RUN: %ACC_RUN_PLACEHOLDER %t1.exe
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple /MDd -o %t2.exe %s
-// RUN: %CPU_RUN_PLACEHOLDER %t2.exe
-// RUN: %GPU_RUN_PLACEHOLDER %t2.exe
-// RUN: %ACC_RUN_PLACEHOLDER %t2.exe
+// RUN: %{build} /MD -o %t1.exe
+// RUN: %{run} %t1.exe
+// RUN: %{build} /MDd -o %t2.exe
+// RUN: %{run} %t2.exe
 // REQUIRES: system-windows, cl_options
 //==-------------- msvc_crt.cpp - SYCL MSVC CRT test -----------------------==//
 //
diff --git a/sycl/test-e2e/Regression/multiple-targets.cpp b/sycl/test-e2e/Regression/multiple-targets.cpp
index 9c5516124b44f..0dcf7a9f283cf 100644
--- a/sycl/test-e2e/Regression/multiple-targets.cpp
+++ b/sycl/test-e2e/Regression/multiple-targets.cpp
@@ -3,17 +3,17 @@
 // The test is repeated for per_kernel device code splitting.
 //
 // REQUIRES: CUDA || HIP
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple,spirv64 -o %t.out %s \
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple,spirv64 -o %t.out %s
+// RUN: %{run} %t.out
 //
-// RUN: %clangxx -fsycl -fsycl-targets=spirv64,%sycl_triple -o %t.out %s \
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %clangxx -fsycl -fsycl-targets=spirv64,%sycl_triple -o %t.out %s
+// RUN: %{run} %t.out
 //
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple,spirv64 -fsycl-device-code-split=per_kernel -o %t.out %s \
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple,spirv64 -fsycl-device-code-split=per_kernel -o %t.out %s
+// RUN: %{run} %t.out
 //
-// RUN: %clangxx -fsycl -fsycl-targets=spirv64,%sycl_triple -fsycl-device-code-split=per_kernel -o %t.out %s \
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %clangxx -fsycl -fsycl-targets=spirv64,%sycl_triple -fsycl-device-code-split=per_kernel -o %t.out %s
+// RUN: %{run} %t.out
 //
 // XFAIL: hip_nvidia
 //
diff --git a/sycl/test-e2e/Regression/nontrivial_device_copyable_value.cpp b/sycl/test-e2e/Regression/nontrivial_device_copyable_value.cpp
index f6cad5fbf6c3a..f4408139625e4 100644
--- a/sycl/test-e2e/Regression/nontrivial_device_copyable_value.cpp
+++ b/sycl/test-e2e/Regression/nontrivial_device_copyable_value.cpp
@@ -1,7 +1,5 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 //
 // Note: Tests that non-trivially copyable types marked as device-copyable are
 // copied and used correctly on the device.
diff --git a/sycl/test-e2e/Regression/optimization_level_debug_info_intopt.cpp b/sycl/test-e2e/Regression/optimization_level_debug_info_intopt.cpp
index 2cd6e145264de..07cb1f655d7b0 100644
--- a/sycl/test-e2e/Regression/optimization_level_debug_info_intopt.cpp
+++ b/sycl/test-e2e/Regression/optimization_level_debug_info_intopt.cpp
@@ -1,7 +1,7 @@
-// RUN: %clangxx %debug_option -fsycl -fsycl-targets=%sycl_triple %s -O0 -o %t.out
-// RUN: %clangxx %debug_option -fsycl -fsycl-targets=%sycl_triple %s -O1 -o %t.out
-// RUN: %clangxx %debug_option -fsycl -fsycl-targets=%sycl_triple %s -O2 -o %t.out
-// RUN: %clangxx %debug_option -fsycl -fsycl-targets=%sycl_triple %s -O3 -o %t.out
+// RUN: %{build} %debug_option -O0 -o %t.out
+// RUN: %{build} %debug_option -O1 -o %t.out
+// RUN: %{build} %debug_option -O2 -o %t.out
+// RUN: %{build} %debug_option -O3 -o %t.out
 
 // NOTE: Tests that debugging information can be generated for all integral
 // optimization levels.
diff --git a/sycl/test-e2e/Regression/optimization_level_debug_info_specopt.cpp b/sycl/test-e2e/Regression/optimization_level_debug_info_specopt.cpp
index e6b7a6a357fed..5856e6f084c29 100644
--- a/sycl/test-e2e/Regression/optimization_level_debug_info_specopt.cpp
+++ b/sycl/test-e2e/Regression/optimization_level_debug_info_specopt.cpp
@@ -1,8 +1,8 @@
-// RUN: %clangxx %debug_option -fsycl -fsycl-targets=%sycl_triple %s -Ofast -o %t.out
-// RUN: %clangxx %debug_option -fsycl -fsycl-targets=%sycl_triple %s -Os -o %t.out
-// RUN: %clangxx %debug_option -fsycl -fsycl-targets=%sycl_triple %s -Oz -o %t.out
-// RUN: %clangxx %debug_option -fsycl -fsycl-targets=%sycl_triple %s -Og -o %t.out
-// RUN: %clangxx %debug_option -fsycl -fsycl-targets=%sycl_triple %s -O -o %t.out
+// RUN: %{build} %debug_option -Ofast -o %t.out
+// RUN: %{build} %debug_option -Os -o %t.out
+// RUN: %{build} %debug_option -Oz -o %t.out
+// RUN: %{build} %debug_option -Og -o %t.out
+// RUN: %{build} %debug_option -O -o %t.out
 
 // NOTE: Tests that debugging information can be generated for all special-name
 // optimization levels.
diff --git a/sycl/test-e2e/Regression/pi_release.cpp b/sycl/test-e2e/Regression/pi_release.cpp
index 1abd231a209d2..3b4d79d13caed 100644
--- a/sycl/test-e2e/Regression/pi_release.cpp
+++ b/sycl/test-e2e/Regression/pi_release.cpp
@@ -1,8 +1,6 @@
 // REQUIRES: opencl || level_zero || cuda
-// RUN: %clangxx -fsycl  -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: env SYCL_PI_TRACE=-1 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER
-// RUN: env SYCL_PI_TRACE=-1 %ACC_RUN_PLACEHOLDER %t.out 2>&1 %ACC_CHECK_PLACEHOLDER
-// RUN: env SYCL_PI_TRACE=-1 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
+// RUN: %{build} -o %t.out
+// RUN: env SYCL_PI_TRACE=-1 %{run} %t.out 2>&1 | FileCheck %s
 
 #include <sycl/sycl.hpp>
 
diff --git a/sycl/test-e2e/Regression/private_array_init_test.cpp b/sycl/test-e2e/Regression/private_array_init_test.cpp
index 12bd9fa339def..b822c8aea684d 100644
--- a/sycl/test-e2e/Regression/private_array_init_test.cpp
+++ b/sycl/test-e2e/Regression/private_array_init_test.cpp
@@ -1,7 +1,5 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 //==- private_array_init_test.cpp - Regression test for private array init -==//
 //
diff --git a/sycl/test-e2e/Regression/reduction_64bit_atomic64.cpp b/sycl/test-e2e/Regression/reduction_64bit_atomic64.cpp
index 9909c3dabad2f..dc138d9b79da8 100644
--- a/sycl/test-e2e/Regression/reduction_64bit_atomic64.cpp
+++ b/sycl/test-e2e/Regression/reduction_64bit_atomic64.cpp
@@ -1,9 +1,7 @@
 // REQUIRES: aspect-atomic64
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
+// RUN: %{build} -o %t.out
 //
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{run} %t.out
 
 // Tests that a previously known case for reduction doesn't cause a requirement
 // for atomic64.
diff --git a/sycl/test-e2e/Regression/reduction_resource_leak_dw.cpp b/sycl/test-e2e/Regression/reduction_resource_leak_dw.cpp
index 0fd5b50a89236..a2ea458752c03 100644
--- a/sycl/test-e2e/Regression/reduction_resource_leak_dw.cpp
+++ b/sycl/test-e2e/Regression/reduction_resource_leak_dw.cpp
@@ -1,8 +1,8 @@
 // REQUIRES: level_zero, level_zero_dev_kit
 // XFAIL: windows
 //
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
+// RUN: %{build} %level_zero_options -o %t.out
+// RUN: env ZE_DEBUG=4 %{run} %t.out 2>&1 | FileCheck %s
 //
 // CHECK-NOT: LEAK
 
diff --git a/sycl/test-e2e/Regression/reduction_resource_leak_usm.cpp b/sycl/test-e2e/Regression/reduction_resource_leak_usm.cpp
index 0365eecaeb78c..6ca0af29b97eb 100644
--- a/sycl/test-e2e/Regression/reduction_resource_leak_usm.cpp
+++ b/sycl/test-e2e/Regression/reduction_resource_leak_usm.cpp
@@ -2,8 +2,8 @@
 // TODO: ZE_DEBUG=4 produces no output on Windows. Enable when fixed.
 // UNSUPPORTED: windows
 //
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
+// RUN: %{build} %level_zero_options -o %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" ZE_DEBUG=4 %{run} %t.out 2>&1 | FileCheck %s
 //
 // CHECK-NOT: LEAK
 
diff --git a/sycl/test-e2e/Regression/same_unnamed_kernels.cpp b/sycl/test-e2e/Regression/same_unnamed_kernels.cpp
index da4de68864479..4b1a2ad64f007 100644
--- a/sycl/test-e2e/Regression/same_unnamed_kernels.cpp
+++ b/sycl/test-e2e/Regression/same_unnamed_kernels.cpp
@@ -1,7 +1,5 @@
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 // Temporarily disabled on CUDA: https://github.com/intel/llvm/issues/9174
 // UNSUPPORTED: hip, cuda
 
diff --git a/sycl/test-e2e/Regression/set-arg-local-accessor.cpp b/sycl/test-e2e/Regression/set-arg-local-accessor.cpp
index bd5f803528f7e..03d8e5b504802 100644
--- a/sycl/test-e2e/Regression/set-arg-local-accessor.cpp
+++ b/sycl/test-e2e/Regression/set-arg-local-accessor.cpp
@@ -1,9 +1,7 @@
 // REQUIRES: opencl, opencl_icd
 //
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s %opencl_lib -o %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{build} %opencl_lib -o %t.out
+// RUN: %{run} %t.out
 
 #include <sycl/sycl.hpp>
 
diff --git a/sycl/test-e2e/Regression/static-buffer-dtor.cpp b/sycl/test-e2e/Regression/static-buffer-dtor.cpp
index a4d7efd741861..8e70c5fb10da1 100644
--- a/sycl/test-e2e/Regression/static-buffer-dtor.cpp
+++ b/sycl/test-e2e/Regression/static-buffer-dtor.cpp
@@ -9,10 +9,8 @@
 // destructors that run as part of program shutdown, after the runtime itself
 // would start shutting down.
 //===----------------------------------------------------------------------===//
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 // Failing on HIP AMD
 // UNSUPPORTED: hip_amd
diff --git a/sycl/test-e2e/Regression/unoptimized_stream.cpp b/sycl/test-e2e/Regression/unoptimized_stream.cpp
index 15d4307f5ec4e..aeaa19f4920e7 100644
--- a/sycl/test-e2e/Regression/unoptimized_stream.cpp
+++ b/sycl/test-e2e/Regression/unoptimized_stream.cpp
@@ -1,9 +1,10 @@
 // Test hangs on AMD with https://github.com/intel/llvm/pull/8412
 // UNSUPPORTED: hip_amd
 
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -O0 -o %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -O0 -o %t.out
+// RUN: %{run} %t.out
+
+// UNSUPPORTED: accelerator
 
 #include <sycl/sycl.hpp>
 
diff --git a/sycl/test-e2e/Regression/usm_malloc_shared.cpp b/sycl/test-e2e/Regression/usm_malloc_shared.cpp
index d044768398932..c3eb8e1ceb61b 100644
--- a/sycl/test-e2e/Regression/usm_malloc_shared.cpp
+++ b/sycl/test-e2e/Regression/usm_malloc_shared.cpp
@@ -1,5 +1,7 @@
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
+// REQUIRES: cpu
+
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 // This test checks if users will successfully allocate 160, 0, and -16 bytes of
 // shared memory, and also test user can call free() without worrying about
diff --git a/sycl/test-e2e/Regression/zero_size_local_accessor.cpp b/sycl/test-e2e/Regression/zero_size_local_accessor.cpp
index 41641f3970dfe..168c8566fe915 100644
--- a/sycl/test-e2e/Regression/zero_size_local_accessor.cpp
+++ b/sycl/test-e2e/Regression/zero_size_local_accessor.cpp
@@ -1,7 +1,5 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %CPU_RUN_PLACEHOLDER %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
-// RUN: %ACC_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 //==---- zero_size_local_accessor.cpp - SYCL 0-size local accessor test ----==//
 //