diff --git a/sycl/test-e2e/E2EExpr.py b/sycl/test-e2e/E2EExpr.py
index 465c69e2af62e..3a7a915b64932 100644
--- a/sycl/test-e2e/E2EExpr.py
+++ b/sycl/test-e2e/E2EExpr.py
@@ -30,6 +30,7 @@ class E2EExpr(BooleanExpression):
         "xptifw",
         "level_zero_dev_kit",
         "cuda_dev_kit",
+        "hip_dev_kit",
         "zstd",
         "vulkan",
         "true",
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 dd1a2372e4df2..4fde0733858e6 100644
--- a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_amdgcn.cpp
+++ b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_amdgcn.cpp
@@ -1,6 +1,8 @@
+// REQUIRES: hip_dev_kit
+
 // UNSUPPORTED: windows
 // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/17515
-// There are no ROCm libs on win machines, so the compilation fails.
+// ROCm libraries are not installed correctly.
 
 // RUN: %clangxx -fsycl -fsycl-targets=amdgcn-amd-amdhsa -Xsycl-target-backend=amdgcn-amd-amdhsa --offload-arch=gfx1030 %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 b92e3e3df6ceb..66a16f842535a 100644
--- a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_nvptx64.cpp
+++ b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_nvptx64.cpp
@@ -1,6 +1,8 @@
+// REQUIRES: cuda_dev_kit
+
 // UNSUPPORTED: windows
 // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/17515
-// There are no CUDA libs on win machines, so the compilation fails.
+// CUDA libs are not installed correctly.
 
 // 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_spir64_x86_64.cpp b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_spir64_x86_64.cpp
index 08fba6fcf9f29..6739fcb11585a 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,8 +1,4 @@
-// REQUIRES: opencl-aot
-
-// UNSUPPORTED: windows
-// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/17515
-// There is no CPU device on win yet, so opencl-aot fails to compile the kernel.
+// REQUIRES: opencl-aot, any-device-is-cpu
 
 // RUN: %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/Inputs/is_compatible_with_env.cpp -o %t.out