diff --git a/sycl/test/esimd/on-device/BitonicSortK.cpp b/sycl/test/esimd/on-device/BitonicSortK.cpp
index d5929fae9e12a..32fb4531cdfe2 100755
--- a/sycl/test/esimd/on-device/BitonicSortK.cpp
+++ b/sycl/test/esimd/on-device/BitonicSortK.cpp
@@ -5,9 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// TODO enable on Windows
-// REQUIRES: linux
-// REQUIRES: gpu
+// TODO enable on Windows and Level Zero
+// REQUIRES: linux && gpu && opencl
 // RUN: %clangxx-esimd -fsycl %s -o %t.out
 // RUN: %ESIMD_RUN_PLACEHOLDER %t.out
 
diff --git a/sycl/test/esimd/on-device/BitonicSortKv2.cpp b/sycl/test/esimd/on-device/BitonicSortKv2.cpp
index 5f08cec74bda5..9c3d4f5417c3c 100755
--- a/sycl/test/esimd/on-device/BitonicSortKv2.cpp
+++ b/sycl/test/esimd/on-device/BitonicSortKv2.cpp
@@ -5,9 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// TODO enable on Windows
-// REQUIRES: linux
-// REQUIRES: gpu
+// TODO enable on Windows and Level Zero
+// REQUIRES: linux && gpu && opencl
 // RUN: %clangxx-esimd -fsycl %s -o %t.out
 // RUN: env SYCL_DEVICE_TYPE=HOST %t.out
 // RUN: %ESIMD_RUN_PLACEHOLDER %t.out
diff --git a/sycl/test/esimd/on-device/accessor.cpp b/sycl/test/esimd/on-device/accessor.cpp
index e0cbbe7dcc6c5..639816ecaf051 100644
--- a/sycl/test/esimd/on-device/accessor.cpp
+++ b/sycl/test/esimd/on-device/accessor.cpp
@@ -5,9 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// TODO enable on Windows
-// REQUIRES: linux
-// REQUIRES: gpu
+// TODO enable on Windows and Level Zero
+// REQUIRES: linux && gpu && opencl
 // RUN: %clangxx-esimd -fsycl -D_CRT_SECURE_NO_WARNINGS=1 %s -o %t.out
 // RUN: %ESIMD_RUN_PLACEHOLDER %t.out
 
diff --git a/sycl/test/esimd/on-device/histogram.cpp b/sycl/test/esimd/on-device/histogram.cpp
index aa044deb010ec..7b1495a5a6b31 100644
--- a/sycl/test/esimd/on-device/histogram.cpp
+++ b/sycl/test/esimd/on-device/histogram.cpp
@@ -5,9 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// TODO enable on Windows
-// REQUIRES: linux
-// REQUIRES: gpu
+// TODO enable on Windows and Level Zero
+// REQUIRES: linux && gpu && opencl
 // RUN: %clangxx-esimd -fsycl %s -o %t.out
 // RUN: env SYCL_DEVICE_TYPE=HOST %t.out
 // RUN: %ESIMD_RUN_PLACEHOLDER %t.out
diff --git a/sycl/test/esimd/on-device/histogram_256_slm.cpp b/sycl/test/esimd/on-device/histogram_256_slm.cpp
index 9f16787cbf597..040834911c41d 100644
--- a/sycl/test/esimd/on-device/histogram_256_slm.cpp
+++ b/sycl/test/esimd/on-device/histogram_256_slm.cpp
@@ -5,9 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// TODO enable on Windows
-// REQUIRES: linux
-// REQUIRES: gpu
+// TODO enable on Windows and Level Zero
+// REQUIRES: linux && gpu && opencl
 // RUN: %clangxx-esimd -fsycl %s -o %t.out
 // RUN: %ESIMD_RUN_PLACEHOLDER %t.out
 
diff --git a/sycl/test/esimd/on-device/histogram_2d.cpp b/sycl/test/esimd/on-device/histogram_2d.cpp
index 826e0d209edc4..bc0f4dfcd5279 100644
--- a/sycl/test/esimd/on-device/histogram_2d.cpp
+++ b/sycl/test/esimd/on-device/histogram_2d.cpp
@@ -5,9 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// TODO enable on Windows
-// REQUIRES: linux
-// REQUIRES: gpu
+// TODO enable on Windows and Level Zero
+// REQUIRES: linux && gpu && opencl
 // RUN: %clangxx-esimd -fsycl %s -o %t.out
 // RUN: env SYCL_DEVICE_TYPE=HOST %t.out
 // RUN: %ESIMD_RUN_PLACEHOLDER %t.out
diff --git a/sycl/test/esimd/on-device/kmeans/kmeans.cpp b/sycl/test/esimd/on-device/kmeans/kmeans.cpp
index f6b0be0a4f994..78ff50d959f1d 100644
--- a/sycl/test/esimd/on-device/kmeans/kmeans.cpp
+++ b/sycl/test/esimd/on-device/kmeans/kmeans.cpp
@@ -5,9 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// TODO enable on Windows
-// REQUIRES: linux
-// REQUIRES: gpu
+// TODO enable on Windows and Level Zero
+// REQUIRES: linux && gpu && opencl
 // RUN: %clangxx-esimd -fsycl %s -I%S/.. -o %t.out
 // RUN: env SYCL_DEVICE_TYPE=HOST %t.out %S/points.big.json
 // RUN: %ESIMD_RUN_PLACEHOLDER %t.out %S/points.big.json
diff --git a/sycl/test/esimd/on-device/linear/linear.cpp b/sycl/test/esimd/on-device/linear/linear.cpp
index 8d67a6d38459a..57260edb3e460 100644
--- a/sycl/test/esimd/on-device/linear/linear.cpp
+++ b/sycl/test/esimd/on-device/linear/linear.cpp
@@ -5,9 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// TODO enable on Windows
-// REQUIRES: linux
-// REQUIRES: gpu
+// TODO enable on Windows and Level Zero
+// REQUIRES: linux && gpu && opencl
 // RUN: %clangxx-esimd -fsycl %s -I%S/.. -o %t.out
 // RUN: env SYCL_DEVICE_TYPE=HOST %t.out %S/linear_in.bmp %S/linear_gold_hw.bmp
 // RUN: %ESIMD_RUN_PLACEHOLDER %t.out %S/linear_in.bmp %S/linear_gold_hw.bmp
diff --git a/sycl/test/esimd/on-device/mandelbrot/mandelbrot.cpp b/sycl/test/esimd/on-device/mandelbrot/mandelbrot.cpp
index 4549150b5c672..53fc92da50e09 100755
--- a/sycl/test/esimd/on-device/mandelbrot/mandelbrot.cpp
+++ b/sycl/test/esimd/on-device/mandelbrot/mandelbrot.cpp
@@ -5,9 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// TODO enable on Windows
-// REQUIRES: linux
-// REQUIRES: gpu
+// TODO enable on Windows and Level Zero
+// REQUIRES: linux && gpu && opencl
 // RUN: %clangxx-esimd -fsycl %s -I%S/.. -o %t.out
 // RUN: %ESIMD_RUN_PLACEHOLDER %t.out %S/output.ppm %S/golden_hw.ppm
 
diff --git a/sycl/test/esimd/on-device/matrix_transpose.cpp b/sycl/test/esimd/on-device/matrix_transpose.cpp
index 27757414ac77a..85c609b75f774 100755
--- a/sycl/test/esimd/on-device/matrix_transpose.cpp
+++ b/sycl/test/esimd/on-device/matrix_transpose.cpp
@@ -5,9 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// TODO enable on Windows
-// REQUIRES: linux
-// REQUIRES: gpu
+// TODO enable on Windows and Level Zero
+// REQUIRES: linux && gpu && opencl
 // RUN: %clangxx-esimd -fsycl %s -o %t.out
 // RUN: %ESIMD_RUN_PLACEHOLDER %t.out
 
diff --git a/sycl/test/esimd/on-device/matrix_transpose_glb.cpp b/sycl/test/esimd/on-device/matrix_transpose_glb.cpp
index 5310a035924af..74dbfb11afb67 100644
--- a/sycl/test/esimd/on-device/matrix_transpose_glb.cpp
+++ b/sycl/test/esimd/on-device/matrix_transpose_glb.cpp
@@ -5,9 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// TODO enable on Windows
-// REQUIRES: linux
-// REQUIRES: gpu
+// TODO enable on Windows and Level Zero
+// REQUIRES: linux && gpu && opencl
 // RUN: %clangxx-esimd -fsycl %s -o %t.out
 // RUN: %ESIMD_RUN_PLACEHOLDER %t.out
 // XFAIL: linux
diff --git a/sycl/test/esimd/on-device/matrix_transpose_usm.cpp b/sycl/test/esimd/on-device/matrix_transpose_usm.cpp
index 14bd0cc4aa581..ffcec1188d8cc 100644
--- a/sycl/test/esimd/on-device/matrix_transpose_usm.cpp
+++ b/sycl/test/esimd/on-device/matrix_transpose_usm.cpp
@@ -5,9 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// TODO enable on Windows
-// REQUIRES: linux
-// REQUIRES: gpu
+// TODO enable on Windows and Level Zero
+// REQUIRES: linux && gpu && opencl
 // RUN: %clangxx-esimd -fsycl %s -o %t.out
 // RUN: env SYCL_DEVICE_TYPE=HOST %t.out
 // RUN: %ESIMD_RUN_PLACEHOLDER %t.out
diff --git a/sycl/test/esimd/on-device/slm_barrier.cpp b/sycl/test/esimd/on-device/slm_barrier.cpp
index cc4e0c96384a3..076f8bb4313e6 100755
--- a/sycl/test/esimd/on-device/slm_barrier.cpp
+++ b/sycl/test/esimd/on-device/slm_barrier.cpp
@@ -5,9 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// TODO enable on Windows
-// REQUIRES: linux
-// REQUIRES: gpu
+// TODO enable on Windows and Level Zero
+// REQUIRES: linux && gpu && opencl
 // RUN: %clangxx-esimd -fsycl %s -o %t.out
 // RUN: %ESIMD_RUN_PLACEHOLDER %t.out
 
diff --git a/sycl/test/esimd/on-device/test_id_3d.cpp b/sycl/test/esimd/on-device/test_id_3d.cpp
index 83d6844d12191..6747d98d9bc20 100755
--- a/sycl/test/esimd/on-device/test_id_3d.cpp
+++ b/sycl/test/esimd/on-device/test_id_3d.cpp
@@ -5,9 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// TODO enable on Windows
-// REQUIRES: linux
-// REQUIRES: gpu
+// TODO enable on Windows and Level Zero
+// REQUIRES: linux && gpu && opencl
 // RUN: %clangxx-esimd -fsycl %s -o %t.out
 // RUN: env SYCL_DEVICE_TYPE=HOST %t.out
 // RUN: %ESIMD_RUN_PLACEHOLDER %t.out
diff --git a/sycl/test/esimd/on-device/vadd_1d.cpp b/sycl/test/esimd/on-device/vadd_1d.cpp
index 9e37d3dd785fd..e9f12af84bece 100644
--- a/sycl/test/esimd/on-device/vadd_1d.cpp
+++ b/sycl/test/esimd/on-device/vadd_1d.cpp
@@ -5,9 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// TODO enable on Windows
-// REQUIRES: linux
-// REQUIRES: gpu
+// TODO enable on Windows and Level Zero
+// REQUIRES: linux && gpu && opencl
 // RUN: %clangxx-esimd -fsycl %s -o %t.out
 // RUN: %ESIMD_RUN_PLACEHOLDER %t.out
 
diff --git a/sycl/test/esimd/on-device/vadd_2d.cpp b/sycl/test/esimd/on-device/vadd_2d.cpp
index 3b6f3cb172f0a..30f6346b0439b 100644
--- a/sycl/test/esimd/on-device/vadd_2d.cpp
+++ b/sycl/test/esimd/on-device/vadd_2d.cpp
@@ -5,9 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// TODO enable on Windows
-// REQUIRES: linux
-// REQUIRES: gpu
+// TODO enable on Windows and Level Zero
+// REQUIRES: linux && gpu && opencl
 // RUN: %clangxx-esimd -fsycl %s -o %t.out
 // RUN: env SYCL_DEVICE_TYPE=HOST %t.out
 // RUN: %ESIMD_RUN_PLACEHOLDER %t.out
diff --git a/sycl/test/esimd/on-device/vadd_usm.cpp b/sycl/test/esimd/on-device/vadd_usm.cpp
index 9b7f26cdc35da..9323269c5074b 100755
--- a/sycl/test/esimd/on-device/vadd_usm.cpp
+++ b/sycl/test/esimd/on-device/vadd_usm.cpp
@@ -5,9 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// TODO enable on Windows
-// REQUIRES: linux
-// REQUIRES: gpu
+// TODO enable on Windows and Level Zero
+// REQUIRES: linux && gpu && opencl
 // RUN: %clangxx-esimd -fsycl %s -o %t.out
 // RUN: env SYCL_DEVICE_TYPE=HOST %t.out
 // RUN: %ESIMD_RUN_PLACEHOLDER %t.out