diff --git a/sycl/test-e2e/AOT/multiple-devices.cpp b/sycl/test-e2e/AOT/multiple-devices.cpp
index 7aee5d417f8d6..e829b379a8358 100644
--- a/sycl/test-e2e/AOT/multiple-devices.cpp
+++ b/sycl/test-e2e/AOT/multiple-devices.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// REQUIRES: opencl-aot, ocloc, cpu, gpu, accelerator
+// REQUIRES: opencl-aot, ocloc, any-device-is-cpu, any-device-is-gpu, any-device-is-accelerator
 // UNSUPPORTED: cuda
 // CUDA is not compatible with SPIR.
 
diff --git a/sycl/test-e2e/AddressSanitizer/invalid-argument/bad-context.cpp b/sycl/test-e2e/AddressSanitizer/invalid-argument/bad-context.cpp
index b602ed606834a..46d0904e88c78 100644
--- a/sycl/test-e2e/AddressSanitizer/invalid-argument/bad-context.cpp
+++ b/sycl/test-e2e/AddressSanitizer/invalid-argument/bad-context.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: linux, (gpu && level_zero), cpu
+// REQUIRES: linux, (gpu && level_zero), any-device-is-cpu
 // RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O2 -g -o %t
 // RUN: env SYCL_PREFER_UR=1 UR_LAYER_ASAN_OPTIONS="detect_kernel_arguments:1" %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s
 
diff --git a/sycl/test-e2e/FilterSelector/filter_list_cpu_gpu_acc.cpp b/sycl/test-e2e/FilterSelector/filter_list_cpu_gpu_acc.cpp
index 5e9022054cb33..15e884bb122b4 100644
--- a/sycl/test-e2e/FilterSelector/filter_list_cpu_gpu_acc.cpp
+++ b/sycl/test-e2e/FilterSelector/filter_list_cpu_gpu_acc.cpp
@@ -6,7 +6,7 @@
 //
 //===---------------------------------------------------------------------===//
 
-// REQUIRES: cpu, gpu, accelerator
+// REQUIRES: any-device-is-cpu, any-device-is-gpu, any-device-is-accelerator
 
 // RUN: %clangxx -fsycl %S/Inputs/filter_list_queries.cpp -o %t.out
 
diff --git a/sycl/test-e2e/FilterSelector/select_device.cpp b/sycl/test-e2e/FilterSelector/select_device.cpp
index aca5344e7acbd..e2eb206ff6292 100644
--- a/sycl/test-e2e/FilterSelector/select_device.cpp
+++ b/sycl/test-e2e/FilterSelector/select_device.cpp
@@ -11,7 +11,7 @@
 // Checks that no device is selected when no device of desired type is
 // available.
 //
-// REQUIRES: cpu,gpu,accelerator
+// REQUIRES: any-device-is-cpu, any-device-is-gpu, any-device-is-accelerator
 
 #include <iostream>
 
diff --git a/sycl/test-e2e/FilterSelector/select_device_opencl.cpp b/sycl/test-e2e/FilterSelector/select_device_opencl.cpp
index f1d76ac696380..672cfb28c67d2 100644
--- a/sycl/test-e2e/FilterSelector/select_device_opencl.cpp
+++ b/sycl/test-e2e/FilterSelector/select_device_opencl.cpp
@@ -6,7 +6,7 @@
 // Checks that no device is selected when no device of desired type is
 // available.
 //
-// REQUIRES: opencl,gpu,cpu,accelerator
+// REQUIRES: any-device-is-opencl, any-device-is-gpu, any-device-is-cpu, any-device-is-accelerator
 
 #include "../helpers.hpp"
 #include <iostream>
diff --git a/sycl/test-e2e/OneapiDeviceSelector/cpu_gpu_acc.cpp b/sycl/test-e2e/OneapiDeviceSelector/cpu_gpu_acc.cpp
index d3019a202526b..67ea8040cf93c 100644
--- a/sycl/test-e2e/OneapiDeviceSelector/cpu_gpu_acc.cpp
+++ b/sycl/test-e2e/OneapiDeviceSelector/cpu_gpu_acc.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: cpu, gpu, accelerator, opencl
+// REQUIRES: any-device-is-cpu, any-device-is-gpu, any-device-is-accelerator, any-device-is-opencl
 
 // RUN: %{build} -o %t.out
 
diff --git a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_amdgcn.cpp b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_amdgcn.cpp
index 5e240044483b7..84081d631500f 100644
--- a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_amdgcn.cpp
+++ b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_amdgcn.cpp
@@ -1,7 +1,7 @@
-// REQUIRES: hip_amd, opencl, gpu, cpu
+// REQUIRES: hip_amd, any-device-is-opencl, any-device-is-gpu, any-device-is-cpu
 
 // RUN: %clangxx -fsycl -Xsycl-target-backend=amdgcn-amd-amdhsa --offload-arch=gfx906 -fsycl-targets=amdgcn-amd-amdhsa %S/Inputs/is_compatible_with_env.cpp -o %t.out
 
-// RUN: env ONEAPI_DEVICE_SELECTOR=hip:gpu %{run} %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:gpu %{run} not %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run} not %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=hip:gpu %{run-unfiltered-devices} %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:gpu %{run-unfiltered-devices} not %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run-unfiltered-devices} not %t.out
diff --git a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_nvptx64.cpp b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_nvptx64.cpp
index ccfa829293c3f..274e873fa38a9 100644
--- a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_nvptx64.cpp
+++ b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_nvptx64.cpp
@@ -1,7 +1,7 @@
-// REQUIRES: cuda, opencl, gpu, cpu
+// REQUIRES: any-device-is-cuda, any-device-is-opencl, any-device-is-gpu, any-device-is-cpu
 
 // RUN: %clangxx -fsycl -fsycl-targets=nvptx64-nvidia-cuda %S/Inputs/is_compatible_with_env.cpp -o %t.out
 
-// RUN: env ONEAPI_DEVICE_SELECTOR=cuda:gpu %{run} %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:gpu %{run} not %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run} not %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=cuda:gpu %{run-unfiltered-devices} %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:gpu %{run-unfiltered-devices} not %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run-unfiltered-devices} not %t.out
diff --git a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_several_targets.cpp b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_several_targets.cpp
index 042874b90290c..218015074f354 100644
--- a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_several_targets.cpp
+++ b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_several_targets.cpp
@@ -1,8 +1,10 @@
-// REQUIRES: ocloc, level_zero, gpu, cpu
+// XFAIL: *
+// XFAIL-TRACKER: https://github.com/intel/llvm/issues/15819
+// REQUIRES: ocloc, any-device-is-level_zero, any-device-is-gpu, any-device-is-cpu
 
 // RUN: %clangxx -fsycl -fsycl-targets=spir64_fpga,spir64_gen -Xsycl-target-backend "-device *" %S/Inputs/is_compatible_with_env.cpp -o %t.out
 
-// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run} not %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:fpga %{run} %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:gpu %{run} %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR=level_zero:gpu %{run} %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run-unfiltered-devices} not %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:fpga %{run-unfiltered-devices} %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:gpu %{run-unfiltered-devices} %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=level_zero:gpu %{run-unfiltered-devices} %t.out
diff --git a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_spir64.cpp b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_spir64.cpp
index 465a79056906a..37b64b36a1be4 100644
--- a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_spir64.cpp
+++ b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_spir64.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: cuda, opencl, gpu, cpu
+// REQUIRES: any-device-is-cuda, any-device-is-opencl, any-device-is-gpu, any-device-is-cpu
 
 // RUN: %clangxx -fsycl -fsycl-targets=spir64 %S/Inputs/is_compatible_with_env.cpp -o %t.out
 
diff --git a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_spir64_fpga.cpp b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_spir64_fpga.cpp
index 57366482e7082..1eb0bc03f50b3 100644
--- a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_spir64_fpga.cpp
+++ b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_spir64_fpga.cpp
@@ -1,7 +1,7 @@
-// REQUIRES: opencl-aot, accelerator, gpu, cpu
+// REQUIRES: opencl-aot, any-device-is-accelerator, any-device-is-gpu, any-device-is-cpu
 
 // RUN: %clangxx -fsycl -fsycl-targets=spir64_fpga %S/Inputs/is_compatible_with_env.cpp -o %t.out
 
-// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:fpga %{run} %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR=*:gpu %{run} not %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run} not %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:fpga %{run-unfiltered-devices} %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=*:gpu %{run-unfiltered-devices} not %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run-unfiltered-devices} not %t.out
diff --git a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_spir64_gen.cpp b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_spir64_gen.cpp
index 5adb27e0ae697..33277f3bf2002 100644
--- a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_spir64_gen.cpp
+++ b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_spir64_gen.cpp
@@ -1,7 +1,7 @@
-// REQUIRES: ocloc, gpu, level_zero, cpu
+// REQUIRES: ocloc, any-device-is-gpu, any-device-is-level_zero, any-device-is-cpu
 
 // RUN: %clangxx -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend "-device *" %S/Inputs/is_compatible_with_env.cpp -o %t.out
 
-// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:gpu %{run} %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR=level_zero:gpu %{run} %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run} not %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:gpu %{run-unfiltered-devices} %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=level_zero:gpu %{run-unfiltered-devices} %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run-unfiltered-devices} not %t.out
diff --git a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_spir64_x86_64.cpp b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_spir64_x86_64.cpp
index 0a6f2c39df8af..9ccd7a984b661 100644
--- a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_spir64_x86_64.cpp
+++ b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_spir64_x86_64.cpp
@@ -1,7 +1,7 @@
-// REQUIRES: opencl-aot, cpu, gpu, level_zero
+// REQUIRES: opencl-aot, any-device-is-cpu, any-device-is-gpu, any-device-is-level_zero
 
 // RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/Inputs/is_compatible_with_env.cpp -o %t.out
 
-// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run} %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:gpu %{run} not %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR=level_zero:gpu %{run} not %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run-unfiltered-devices} %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:gpu %{run-unfiltered-devices} not %t.out
+// RUN: env ONEAPI_DEVICE_SELECTOR=level_zero:gpu %{run-unfiltered-devices} not %t.out
diff --git a/sycl/test-e2e/SpecConstants/2020/native_specialization_constant.cpp b/sycl/test-e2e/SpecConstants/2020/native_specialization_constant.cpp
index 170e0aad6b33f..2534e3aae47f7 100644
--- a/sycl/test-e2e/SpecConstants/2020/native_specialization_constant.cpp
+++ b/sycl/test-e2e/SpecConstants/2020/native_specialization_constant.cpp
@@ -2,8 +2,8 @@
 // on opencl & level-zero backends
 // (because only SPIR-V supports specialization constants natively)
 
-// FIXME: This set is never satisfied all at once in our infrastructure.
-// REQUIRES: opencl, level-zero, cpu, gpu, opencl-aot, ocloc
+// REQUIRES: any-device-is-opencl, any-device-is-level_zero, opencl-aot, ocloc
+// UNSUPPORTED: accelerator
 
 // RUN: %clangxx -fsycl -DJIT %s -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/USM/multictxt.cpp b/sycl/test-e2e/USM/multictxt.cpp
index 872294ca3e537..637ce853d7b07 100644
--- a/sycl/test-e2e/USM/multictxt.cpp
+++ b/sycl/test-e2e/USM/multictxt.cpp
@@ -1,7 +1,7 @@
 // RUN: %{build} -o %t1.out
 // RUN: %{run-unfiltered-devices} %t1.out
 
-// REQUIRES: cpu, gpu
+// REQUIRES: any-device-is-cpu, any-device-is-gpu
 
 //==----------------- multictxt.cpp - Multi Context USM test ---------------==//
 //