diff --git a/sycl/test-e2e/Adapters/level_zero/ext_intel_queue_index.cpp b/sycl/test-e2e/Adapters/level_zero/ext_intel_queue_index.cpp
index e10cf010eba01..cc49640f837b6 100644
--- a/sycl/test-e2e/Adapters/level_zero/ext_intel_queue_index.cpp
+++ b/sycl/test-e2e/Adapters/level_zero/ext_intel_queue_index.cpp
@@ -4,7 +4,10 @@
 // XFAIL: gpu-intel-pvc-1T
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/15699
 
-// XFAIL: linux && run-mode && (arch-intel_gpu_bmg_g21 || gpu-intel-dg2) && !igc-dev
+// XFAIL: gpu-intel-dg2
+// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18576
+
+// XFAIL: linux && run-mode && arch-intel_gpu_bmg_g21 && !igc-dev
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/18576
 
 // XFAIL: windows && arch-intel_gpu_bmg_g21