diff --git a/sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp b/sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp
index 905c3d99355d8..724f4cef5010a 100644
--- a/sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp
+++ b/sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp
@@ -1,5 +1,6 @@
 // UNSUPPORTED: windows
-// REQUIRES: (cuda || hip) && unsplit-mode
+// REQUIRES: (cuda || hip)
+// REQUIRES: unsplit-mode
 
 // This test relies on debug output from a pass, make sure that the compiler
 // can generate it.
diff --git a/sycl/test-e2e/Compression/no_zstd_warning.cpp b/sycl/test-e2e/Compression/no_zstd_warning.cpp
index a08e363744204..b771d63d9b23e 100644
--- a/sycl/test-e2e/Compression/no_zstd_warning.cpp
+++ b/sycl/test-e2e/Compression/no_zstd_warning.cpp
@@ -1,4 +1,4 @@
 // using --offload-compress without zstd should throw an error.
-// UNSUPPORTED: zstd
+// REQUIRES: windows && cpu
 // RUN: not %{build} -O0 -g --offload-compress %S/Inputs/single_kernel.cpp -o %t_compress.out 2>&1 | FileCheck %s
 // CHECK: '--offload-compress' option is specified but zstd is not available. The device image will not be compressed.
diff --git a/sycl/test-e2e/DeviceGlobal/device_global_copy.cpp b/sycl/test-e2e/DeviceGlobal/device_global_copy.cpp
index 51528223d1b63..2d9ea347179ce 100644
--- a/sycl/test-e2e/DeviceGlobal/device_global_copy.cpp
+++ b/sycl/test-e2e/DeviceGlobal/device_global_copy.cpp
@@ -1,7 +1,6 @@
 // RUN: %{build} -std=c++23 -o %t.out
 // RUN: %{run} %t.out
 //
-// REQUIRES: unsplit-mode
 // UNSUPPORTED: opencl && gpu
 // UNSUPPORTED-TRACKER: GSD-4287
 //
diff --git a/sycl/test-e2e/EnqueueNativeCommand/custom-command-cuda.cpp b/sycl/test-e2e/EnqueueNativeCommand/custom-command-cuda.cpp
index d0f0c115ec635..8188aa37dc97b 100644
--- a/sycl/test-e2e/EnqueueNativeCommand/custom-command-cuda.cpp
+++ b/sycl/test-e2e/EnqueueNativeCommand/custom-command-cuda.cpp
@@ -1,6 +1,7 @@
 // RUN: %{build} -Wno-error=deprecated-declarations -o %t.out %cuda_options
 // RUN: %{run} %t.out
-// REQUIRES: cuda, cuda_dev_kit, unsplit-mode
+// REQUIRES: cuda, cuda_dev_kit
+// REQUIRES: unsplit-mode
 
 #include <cuda.h>
 
diff --git a/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp b/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp
index 9608e5306d0c6..0886d198036f6 100644
--- a/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp
+++ b/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp
@@ -2,7 +2,8 @@
 // we should set this with some variable instead.
 // RUN: %{build} -o %t.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64
 // RUN: %{run} %t.out
-// REQUIRES: hip, unsplit-mode
+// REQUIRES: hip
+// REQUIRES: unsplit-mode
 
 #include <iostream>
 #include <sycl/backend.hpp>
diff --git a/sycl/test-e2e/EnqueueNativeCommand/custom-command-multiple-dev-cuda.cpp b/sycl/test-e2e/EnqueueNativeCommand/custom-command-multiple-dev-cuda.cpp
index 5329d349349b1..961fb63702cad 100644
--- a/sycl/test-e2e/EnqueueNativeCommand/custom-command-multiple-dev-cuda.cpp
+++ b/sycl/test-e2e/EnqueueNativeCommand/custom-command-multiple-dev-cuda.cpp
@@ -1,4 +1,5 @@
-// REQUIRES: cuda, cuda_dev_kit, unsplit-mode
+// REQUIRES: cuda, cuda_dev_kit
+// REQUIRES: unsplit-mode
 // RUN: %{build} -o %t.out %cuda_options
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/HostInteropTask/interop-task-cuda-buffer-migrate.cpp b/sycl/test-e2e/HostInteropTask/interop-task-cuda-buffer-migrate.cpp
index f3d2f79d8dd68..a143575fd65f5 100644
--- a/sycl/test-e2e/HostInteropTask/interop-task-cuda-buffer-migrate.cpp
+++ b/sycl/test-e2e/HostInteropTask/interop-task-cuda-buffer-migrate.cpp
@@ -1,4 +1,5 @@
-// REQUIRES: cuda, cuda_dev_kit, unsplit-mode
+// REQUIRES: cuda, cuda_dev_kit
+// REQUIRES: unsplit-mode
 //
 // RUN: %{build} -o %t.out %cuda_options
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/HostInteropTask/interop-task-cuda.cpp b/sycl/test-e2e/HostInteropTask/interop-task-cuda.cpp
index 3f8895b9e31eb..f45bf0f73778a 100644
--- a/sycl/test-e2e/HostInteropTask/interop-task-cuda.cpp
+++ b/sycl/test-e2e/HostInteropTask/interop-task-cuda.cpp
@@ -1,6 +1,7 @@
 // RUN: %{build} -o %t.out %cuda_options
 // RUN: %{run} %t.out
-// REQUIRES: cuda, cuda_dev_kit, unsplit-mode
+// REQUIRES: cuda, cuda_dev_kit
+// REQUIRES: unsplit-mode
 
 #include <iostream>
 #include <sycl/backend.hpp>
diff --git a/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp b/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp
index ce742a592985f..c7abb1526b411 100644
--- a/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp
+++ b/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp
@@ -2,7 +2,8 @@
 // we should set this with some variable instead.
 // RUN: %{build} -Wno-error=deprecated-declarations -o %t.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64
 // RUN: %{run} %t.out
-// REQUIRES: hip, unsplit-mode
+// REQUIRES: hip
+// REQUIRES: unsplit-mode
 
 #include <iostream>
 #include <sycl/backend.hpp>
diff --git a/sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp b/sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp
index 6a3eae629e277..691a40c1e15f3 100644
--- a/sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp
+++ b/sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp
@@ -1,7 +1,8 @@
 // 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, unsplit-mode
+// REQUIRES: level_zero, ocloc
+// REQUIRES: unsplit-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/Matrix/joint_matrix_hip_gfx90a.cpp b/sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp
index 80c32f1e73c55..0001c703b545e 100644
--- a/sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp
+++ b/sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp
@@ -9,7 +9,8 @@
 // RUN: %{build} -fsycl -fsycl-targets=amd_gpu_gfx90a %s -o %t.out
 // RUN: %{run} %t.out
 
-// REQUIRES: gpu-amd-gfx90a, unsplit-mode
+// REQUIRES: gpu-amd-gfx90a
+// REQUIRES: unsplit-mode
 
 #include "joint_matrix_hip_apply.hpp"
 #include "joint_matrix_hip_copy.hpp"
diff --git a/sycl/test-e2e/Matrix/joint_matrix_tensorcores_sm70.cpp b/sycl/test-e2e/Matrix/joint_matrix_tensorcores_sm70.cpp
index b943b705d0271..4dd26f6299209 100644
--- a/sycl/test-e2e/Matrix/joint_matrix_tensorcores_sm70.cpp
+++ b/sycl/test-e2e/Matrix/joint_matrix_tensorcores_sm70.cpp
@@ -6,7 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-// REQUIRES: cuda, unsplit-mode
+// REQUIRES: cuda
+// REQUIRES: unsplit-mode
 // RUN: %{build} -Xsycl-target-backend --cuda-gpu-arch=sm_70 -o %t.out
 // RUN: %{run} %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 2db8b27437ca2..8e020516056ae 100644
--- a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_amdgcn.cpp
+++ b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_amdgcn.cpp
@@ -1,4 +1,5 @@
-// REQUIRES: hip_amd, opencl, gpu, cpu, unsplit-mode
+// REQUIRES: hip_amd, opencl, gpu, cpu
+// REQUIRES: unsplit-mode
 
 // 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
 
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 3a002de562bdc..21f04fe2d2fa4 100644
--- a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_nvptx64.cpp
+++ b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_nvptx64.cpp
@@ -1,4 +1,5 @@
-// REQUIRES: cuda, opencl, gpu, cpu, unsplit-mode
+// REQUIRES: cuda, opencl, gpu, cpu
+// REQUIRES: unsplit-mode
 
 // RUN: %clangxx -fsycl -fsycl-targets=nvptx64-nvidia-cuda %S/Inputs/is_compatible_with_env.cpp -o %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 addb6d5b0379e..fd4156cf77d0e 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,4 +1,5 @@
-// REQUIRES: ocloc, level_zero, gpu, cpu, unsplit-mode
+// REQUIRES: ocloc, level_zero, gpu, cpu
+// REQUIRES: unsplit-mode
 
 // RUN: %clangxx -fsycl -fsycl-targets=spir64_fpga,spir64_gen -Xsycl-target-backend "-device *" %S/Inputs/is_compatible_with_env.cpp -o %t.out
 
diff --git a/sycl/test-e2e/Plugin/cuda_queue_priority.cpp b/sycl/test-e2e/Plugin/cuda_queue_priority.cpp
index b356afc2c80f6..237cfee60406f 100644
--- a/sycl/test-e2e/Plugin/cuda_queue_priority.cpp
+++ b/sycl/test-e2e/Plugin/cuda_queue_priority.cpp
@@ -1,4 +1,5 @@
-// REQUIRES: gpu, cuda, cuda_dev_kit, unsplit-mode
+// REQUIRES: gpu, cuda, cuda_dev_kit
+// REQUIRES: unsplit-mode
 // RUN: %{build} %cuda_options -o %t.out
 // RUN: %{run} %t.out
 //
diff --git a/sycl/test-e2e/Plugin/sycl-ls-gpu-cuda.cpp b/sycl/test-e2e/Plugin/sycl-ls-gpu-cuda.cpp
index f15e624527a17..51d935ce8d376 100644
--- a/sycl/test-e2e/Plugin/sycl-ls-gpu-cuda.cpp
+++ b/sycl/test-e2e/Plugin/sycl-ls-gpu-cuda.cpp
@@ -1,4 +1,5 @@
-// REQUIRES: gpu, cuda, unsplit-mode
+// REQUIRES: gpu, cuda
+// REQUIRES: unsplit-mode
 
 // RUN: env ONEAPI_DEVICE_SELECTOR="cuda:*" sycl-ls --verbose >%t.cuda.out
 // RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-CUDA,CHECK-CUSTOM-GPU-CUDA --input-file %t.cuda.out
diff --git a/sycl/test-e2e/Plugin/sycl-ls-gpu-hip.cpp b/sycl/test-e2e/Plugin/sycl-ls-gpu-hip.cpp
index 66ce38c56e5cf..37417a7a39aa9 100644
--- a/sycl/test-e2e/Plugin/sycl-ls-gpu-hip.cpp
+++ b/sycl/test-e2e/Plugin/sycl-ls-gpu-hip.cpp
@@ -1,4 +1,5 @@
-// REQUIRES: gpu, hip, sycl-ls, unsplit-mode
+// REQUIRES: gpu, hip, sycl-ls
+// REQUIRES: unsplit-mode
 
 // RUN: env ONEAPI_DEVICE_SELECTOR="hip:*" sycl-ls --verbose >%t.hip.out
 // RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-HIP,CHECK-CUSTOM-GPU-HIP --input-file %t.hip.out
diff --git a/sycl/test-e2e/Plugin/sycl-ls-gpu-sycl-be.cpp b/sycl/test-e2e/Plugin/sycl-ls-gpu-sycl-be.cpp
index 40f84e52b117d..147c6a6787399 100644
--- a/sycl/test-e2e/Plugin/sycl-ls-gpu-sycl-be.cpp
+++ b/sycl/test-e2e/Plugin/sycl-ls-gpu-sycl-be.cpp
@@ -1,4 +1,5 @@
-// REQUIRES: gpu, cuda, hip, opencl, sycl-ls, unsplit-mode
+// REQUIRES: gpu, cuda, hip, opencl, sycl-ls
+// REQUIRES: unsplit-mode
 
 // RUN: sycl-ls --verbose >%t.default.out
 // RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-OPENCL,CHECK-CUSTOM-GPU-OPENCL --input-file %t.default.out
diff --git a/sycl/test-e2e/Plugin/sycl-targets-order.cpp b/sycl/test-e2e/Plugin/sycl-targets-order.cpp
index adc3f21bb6e9a..606242d4b720f 100644
--- a/sycl/test-e2e/Plugin/sycl-targets-order.cpp
+++ b/sycl/test-e2e/Plugin/sycl-targets-order.cpp
@@ -5,7 +5,8 @@
 // RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="opencl:*" %t-nvptx64-spir64.out
 // RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="cuda:*"   %t-nvptx64-spir64.out
 
-// REQUIRES: opencl, cuda, unsplit-mode
+// REQUIRES: opencl, cuda
+// REQUIRES: unsplit-mode
 
 //==------- sycl-targets-order.cpp - SYCL -fsycl-targets order test --------==//
 //
diff --git a/sycl/test-e2e/Regression/multiple-targets.cpp b/sycl/test-e2e/Regression/multiple-targets.cpp
index 0fb4b93af8eea..4d5eeaa3b623b 100644
--- a/sycl/test-e2e/Regression/multiple-targets.cpp
+++ b/sycl/test-e2e/Regression/multiple-targets.cpp
@@ -2,7 +2,8 @@
 // It tests if the target triples can be specified with any order.
 // The test is repeated for per_kernel device code splitting.
 //
-// REQUIRES: (cuda || hip || native_cpu) && unsplit-mode
+// REQUIRES: (cuda || hip || native_cpu)
+// REQUIRES: unsplit-mode
 // RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple},spir64 -o %t1.out %s
 // RUN: %{run} %t1.out
 //
diff --git a/sycl/test-e2e/SpecConstants/2020/non_native/cuda.cpp b/sycl/test-e2e/SpecConstants/2020/non_native/cuda.cpp
index 9d5ef7d12aee8..27a42e0778b30 100644
--- a/sycl/test-e2e/SpecConstants/2020/non_native/cuda.cpp
+++ b/sycl/test-e2e/SpecConstants/2020/non_native/cuda.cpp
@@ -1,4 +1,5 @@
-// REQUIRES: cuda, unsplit-mode
+// REQUIRES: cuda
+// REQUIRES: unsplit-mode
 
 // RUN: %clangxx -fsycl -fsycl-targets=nvptx64-nvidia-cuda %S/Inputs/common.cpp -o %t.out
 // RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="cuda:*" %t.out
diff --git a/sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp b/sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp
index 1ba5d744639ab..c481472b40d1c 100644
--- a/sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp
+++ b/sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp
@@ -1,5 +1,6 @@
-// REQUIRES: cuda,aspect-ext_oneapi_cubemap, unsplit-mode
+// REQUIRES: cuda,aspect-ext_oneapi_cubemap
 // REQUIRES: aspect-ext_oneapi_cubemap_seamless_filtering
+// REQUIRES: unsplit-mode
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/bindless_images/examples/example_5_sample_cubemap.cpp b/sycl/test-e2e/bindless_images/examples/example_5_sample_cubemap.cpp
index 8fe477ab93831..35e16b905efce 100644
--- a/sycl/test-e2e/bindless_images/examples/example_5_sample_cubemap.cpp
+++ b/sycl/test-e2e/bindless_images/examples/example_5_sample_cubemap.cpp
@@ -1,4 +1,5 @@
-// REQUIRES: cuda, unsplit-mode
+// REQUIRES: cuda
+// REQUIRES: unsplit-mode
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/syclcompat/launch/launch_properties.cpp b/sycl/test-e2e/syclcompat/launch/launch_properties.cpp
index 128517dd2de71..d24464f2bf986 100644
--- a/sycl/test-e2e/syclcompat/launch/launch_properties.cpp
+++ b/sycl/test-e2e/syclcompat/launch/launch_properties.cpp
@@ -22,7 +22,8 @@
  *     sycl/test-e2e/ClusterLaunch/cluster_launch_parallel_for.cpp
  **************************************************************************/
 
-// REQUIRES: aspect-ext_oneapi_cuda_cluster_group, unsplit-mode
+// REQUIRES: aspect-ext_oneapi_cuda_cluster_group
+// REQUIRES: unsplit-mode
 // RUN: %{build} -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_90 -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/syclcompat/memory/local_memory_ptr_to_integer.cpp b/sycl/test-e2e/syclcompat/memory/local_memory_ptr_to_integer.cpp
index 752dcbf6b0897..51673bd1843b1 100644
--- a/sycl/test-e2e/syclcompat/memory/local_memory_ptr_to_integer.cpp
+++ b/sycl/test-e2e/syclcompat/memory/local_memory_ptr_to_integer.cpp
@@ -1,4 +1,5 @@
-// REQUIRES: cuda, unsplit-mode
+// REQUIRES: cuda
+// REQUIRES: unsplit-mode
 // RUN:  %{build} -Xsycl-target-backend --cuda-gpu-arch=sm_75 -o %t.out
 // RUN:  %{run} %t.out
 #include <sycl/detail/core.hpp>