diff --git a/SYCL/ESIMD/dword_atomic_cmpxchg.cpp b/SYCL/ESIMD/dword_atomic_cmpxchg.cpp
index 42b98bfe2d..7674af83a7 100644
--- a/SYCL/ESIMD/dword_atomic_cmpxchg.cpp
+++ b/SYCL/ESIMD/dword_atomic_cmpxchg.cpp
@@ -9,8 +9,8 @@
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
 // UNSUPPORTED: cuda || hip
-// TODO: esimd_emulator fails due to unsupported __esimd_svm_atomic0/1/2
-// XFAIL: esimd_emulator
+// TODO: esimd_emulator fails due to random timeouts (_XFAIL_: esimd_emulator)
+// UNSUPPORTED: esimd_emulator
 // RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
diff --git a/SYCL/ESIMD/dword_atomic_smoke.cpp b/SYCL/ESIMD/dword_atomic_smoke.cpp
index 261710277c..d0fd376413 100644
--- a/SYCL/ESIMD/dword_atomic_smoke.cpp
+++ b/SYCL/ESIMD/dword_atomic_smoke.cpp
@@ -9,8 +9,6 @@
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
 // UNSUPPORTED: cuda || hip
-// TODO: esimd_emulator fails due to unsupported __esimd_svm_atomic0/1/2
-// XFAIL: esimd_emulator
 // RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
diff --git a/SYCL/ESIMD/lsc/atomic_cmpxchg.cpp b/SYCL/ESIMD/lsc/atomic_cmpxchg.cpp
index 7476995abe..9bd40cd1ea 100644
--- a/SYCL/ESIMD/lsc/atomic_cmpxchg.cpp
+++ b/SYCL/ESIMD/lsc/atomic_cmpxchg.cpp
@@ -8,8 +8,8 @@
 // This test checks LSC compare-and-exchange atomic operations.
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu-intel-pvc
-// TODO: esimd_emulator fails due to unsupported __esimd_svm_atomic0/1/2
-// XFAIL: esimd_emulator
+// TODO: esimd_emulator fails due to random timeouts (_XFAIL_: esimd_emulator)
+// UNSUPPORTED: esimd_emulator
 // RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
diff --git a/SYCL/ESIMD/lsc/atomic_smoke.cpp b/SYCL/ESIMD/lsc/atomic_smoke.cpp
index e48e2905fc..6ae5707649 100644
--- a/SYCL/ESIMD/lsc/atomic_smoke.cpp
+++ b/SYCL/ESIMD/lsc/atomic_smoke.cpp
@@ -8,8 +8,8 @@
 // This test checks LSC atomic operations.
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu-intel-pvc
-// TODO: esimd_emulator fails due to unsupported __esimd_svm_atomic0/1/2
-// XFAIL: esimd_emulator
+// TODO: esimd_emulator fails due to random timeouts (_XFAIL_: esimd_emulator)
+// UNSUPPORTED: esimd_emulator
 // RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
diff --git a/SYCL/ESIMD/lsc/lsc_fence.cpp b/SYCL/ESIMD/lsc/lsc_fence.cpp
index 99cc6bc912..400f1295a6 100644
--- a/SYCL/ESIMD/lsc/lsc_fence.cpp
+++ b/SYCL/ESIMD/lsc/lsc_fence.cpp
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// REQUIRES: gpu-intel-pvc
+// REQUIRES: gpu-intel-pvc || esimd_emulator
 // UNSUPPORTED: cuda || hip
 // RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out