diff --git a/SYCL/KernelAndProgram/cache_env_vars.cpp b/SYCL/KernelAndProgram/cache_env_vars.cpp
index a25edfb33c..d0105af10d 100644
--- a/SYCL/KernelAndProgram/cache_env_vars.cpp
+++ b/SYCL/KernelAndProgram/cache_env_vars.cpp
@@ -3,15 +3,15 @@
 // RUN: rm -rf %t/cache_dir
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -DTARGET_IMAGE=INC100
 // Build program and add item to cache
-// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
+// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
 // Ignore caching because image size is less than threshold
-// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 SYCL_CACHE_MIN_DEVICE_IMAGE_SIZE=100000 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
+// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 SYCL_CACHE_MIN_DEVICE_IMAGE_SIZE=100000 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
 // Ignore caching because image size is more than threshold
-// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 SYCL_CACHE_MAX_DEVICE_IMAGE_SIZE=1000 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
+// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 SYCL_CACHE_MAX_DEVICE_IMAGE_SIZE=1000 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
 // Use cache
-// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-CACHE
+// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-CACHE
 // Ignore cache because of environment variable
-// RUN: env SYCL_CACHE_PERSISTENT=0 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
+// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=0 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
 //
 // The test checks environment variables which may disable caching.
 // Also it can be used for benchmarking cache:
diff --git a/SYCL/KernelAndProgram/cache_env_vars_lin.cpp b/SYCL/KernelAndProgram/cache_env_vars_lin.cpp
index 6dded2e3c8..8779f607ed 100644
--- a/SYCL/KernelAndProgram/cache_env_vars_lin.cpp
+++ b/SYCL/KernelAndProgram/cache_env_vars_lin.cpp
@@ -7,20 +7,20 @@
 
 // When no environment variables pointing cache directory are set the cache is
 // disabled
-// RUN: env SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u HOME env -u XDG_CACHE_HOME SYCL_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
-// RUN: env SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u HOME env -u XDG_CACHE_HOME SYCL_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
+// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u HOME env -u XDG_CACHE_HOME SYCL_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
+// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u HOME env -u XDG_CACHE_HOME SYCL_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
 
 // When any of environment variables pointing to cache root is present cache is
 // enabled
 // RUN: rm -rf %t/cache_dir
-// RUN: env SYCL_CACHE_PERSISTENT=1 XDG_CACHE_HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u SYCL_CACHE_DIR env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
-// RUN: env SYCL_CACHE_PERSISTENT=1 XDG_CACHE_HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u SYCL_CACHE_DIR env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-CACHE
+// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 XDG_CACHE_HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u SYCL_CACHE_DIR env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
+// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 XDG_CACHE_HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u SYCL_CACHE_DIR env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-CACHE
 // RUN: rm -rf %t/cache_dir
-// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
-// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u HOME %t.out %t.out | FileCheck %s --check-prefixes=CHECK-CACHE
+// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
+// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u HOME %t.out %t.out | FileCheck %s --check-prefixes=CHECK-CACHE
 // RUN: rm -rf %t/cache_dir
-// RUN: env SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
-// RUN: env SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-CACHE
+// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
+// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-CACHE
 
 // CHECK-BUILD-NOT: piProgramCreateWithBinary(
 // CHECK-BUILD: piProgramCreate(
diff --git a/SYCL/SpecConstants/2020/host_apis.cpp b/SYCL/SpecConstants/2020/host_apis.cpp
index c8fd72ae39..7011113ef8 100644
--- a/SYCL/SpecConstants/2020/host_apis.cpp
+++ b/SYCL/SpecConstants/2020/host_apis.cpp
@@ -1,6 +1,6 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out \
 // RUN:          -fsycl-dead-args-optimization
-// RUN: %t.out
+// RUN: %BE_RUN_PLACEHOLDER %t.out
 
 // UNSUPPORTED: cuda
 // UNSUPPORTED: hip
diff --git a/SYCL/lit.cfg.py b/SYCL/lit.cfg.py
index 1cc543fa53..893c829a91 100644
--- a/SYCL/lit.cfg.py
+++ b/SYCL/lit.cfg.py
@@ -273,11 +273,11 @@
 if 'cpu' in config.target_devices.split(','):
     found_at_least_one_device = True
     lit_config.note("Test CPU device")
-    cpu_run_substitute = "env SYCL_DEVICE_FILTER=cpu,host "
+    cpu_run_substitute = "env SYCL_DEVICE_FILTER={SYCL_PLUGIN}:cpu,host ".format(SYCL_PLUGIN=config.sycl_be)
     cpu_check_substitute = "| FileCheck %s"
     config.available_features.add('cpu')
     if platform.system() == "Linux":
-        cpu_run_on_linux_substitute = "env SYCL_DEVICE_FILTER=cpu,host "
+        cpu_run_on_linux_substitute = cpu_run_substitute
         cpu_check_on_linux_substitute = "| FileCheck %s"
 else:
     lit_config.warning("CPU device not used")