diff --git a/sycl/test-e2e/Basic/kernel_info.cpp b/sycl/test-e2e/Basic/kernel_info.cpp
index 8af5ae3020d5d..5c3c1551a6a38 100644
--- a/sycl/test-e2e/Basic/kernel_info.cpp
+++ b/sycl/test-e2e/Basic/kernel_info.cpp
@@ -4,8 +4,8 @@
 // Fail is flaky for level_zero, enable when fixed.
 // UNSUPPORTED: level_zero
 //
-// Consistently fails with opencl non-fpga, enable when fixed.
-// XFAIL: opencl && !accelerator
+// Consistently fails with opencl gpu, enable when fixed.
+// XFAIL: opencl && gpu
 
 //==--- kernel_info.cpp - SYCL kernel info test ----------------------------==//
 //
diff --git a/sycl/test-e2e/GroupAlgorithm/root_group.cpp b/sycl/test-e2e/GroupAlgorithm/root_group.cpp
index 94486874bc4da..f648820d62846 100644
--- a/sycl/test-e2e/GroupAlgorithm/root_group.cpp
+++ b/sycl/test-e2e/GroupAlgorithm/root_group.cpp
@@ -1,5 +1,5 @@
-// Fails with opencl and level_zero on linux, enable when fixed.
-// XFAIL: opencl || (linux && level_zero)
+// Fails with opencl non-cpu and level_zero on linux, enable when fixed.
+// XFAIL: (opencl && !cpu) || (linux && level_zero)
 // RUN: %{build} -I . -o %t.out
 // RUN: %{run} %t.out