diff --git a/sycl/test-e2e/Basic/fill_accessor.cpp b/sycl/test-e2e/Basic/fill_accessor.cpp
index 20762c102ee54..0f000d1baac4b 100644
--- a/sycl/test-e2e/Basic/fill_accessor.cpp
+++ b/sycl/test-e2e/Basic/fill_accessor.cpp
@@ -4,9 +4,6 @@
 // XFAIL: run-mode && linux && arch-intel_gpu_pvc && level_zero_v2_adapter
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/19585
 
-// XFAIL: run-mode && linux && arch-intel_gpu_bmg_g21 && level_zero_v2_adapter
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/19586
-
 #include <sycl/detail/core.hpp>
 
 #include <algorithm>
diff --git a/sycl/test-e2e/Basic/image/image_write.cpp b/sycl/test-e2e/Basic/image/image_write.cpp
index 2578948b92f6a..95574ca6d391a 100644
--- a/sycl/test-e2e/Basic/image/image_write.cpp
+++ b/sycl/test-e2e/Basic/image/image_write.cpp
@@ -1,4 +1,6 @@
 // REQUIRES: aspect-ext_intel_legacy_image
+// XFAIL: linux && arch-intel_gpu_bmg_g21 && preview-mode
+// XFAIL-TRACKER: https://github.com/intel/llvm/issues/20224
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/FreeFunctionKernels/enum_parameter.cpp b/sycl/test-e2e/FreeFunctionKernels/enum_parameter.cpp
index baacc29c74f34..2c36d679649b2 100644
--- a/sycl/test-e2e/FreeFunctionKernels/enum_parameter.cpp
+++ b/sycl/test-e2e/FreeFunctionKernels/enum_parameter.cpp
@@ -1,6 +1,9 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
+// UNSUPPORTED: linux && arch-intel_gpu_bmg_g21 && level_zero_v2_adapter
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20225
+
 // This test verifies that we can use scoped enum types as arguments in free
 // function kernels.
 
diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp
index 09fc6efa111cd..5f01d834ae582 100644
--- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp
+++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp
@@ -13,10 +13,5 @@
 
 // -ffp-model=precise is added to not depend on compiler defaults.
 
-// Waiting for the commit in IGC to be pulled into the driver to resolve the
-// test.
-// XFAIL: run-mode && arch-intel_gpu_pvc
-// XFAIL-TRACKER: GSD-10510, GSD-11681
-
 #include "common.hpp"
 #include "joint_matrix_bf16_fill_k_cache_impl.hpp"
diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp
index e82175938bff2..16407d1c83002 100644
--- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp
+++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp
@@ -14,10 +14,5 @@
 
 // -ffp-model=precise is added to not depend on compiler defaults.
 
-// Waiting for the commit in IGC to be pulled into the driver to resolve the
-// test.
-// XFAIL: run-mode && arch-intel_gpu_pvc
-// XFAIL-TRACKER: GSD-10510, GSD-11681
-
 #include "common.hpp"
 #include "joint_matrix_bf16_fill_k_cache_impl.hpp"
diff --git a/sycl/test-e2e/Matrix/joint_matrix_bfloat16_accumulator.cpp b/sycl/test-e2e/Matrix/joint_matrix_bfloat16_accumulator.cpp
index a540c49d59a9e..d799445910d74 100644
--- a/sycl/test-e2e/Matrix/joint_matrix_bfloat16_accumulator.cpp
+++ b/sycl/test-e2e/Matrix/joint_matrix_bfloat16_accumulator.cpp
@@ -14,7 +14,7 @@
 // REQUIRES: aspect-ext_intel_matrix
 // REQUIRES-INTEL-DRIVER: lin: 27501, win: 101.4943
 
-// XFAIL: gpu && (!igc-dev || gpu-intel-dg2)
+// XFAIL: gpu-intel-dg2
 // XFAIL-TRACKER: GSD-10112
 
 // RUN: %{build} -o %t.out
diff --git a/sycl/test-e2e/Matrix/joint_matrix_half_accumulator.cpp b/sycl/test-e2e/Matrix/joint_matrix_half_accumulator.cpp
index 304804531aea6..ad6c25934ce76 100644
--- a/sycl/test-e2e/Matrix/joint_matrix_half_accumulator.cpp
+++ b/sycl/test-e2e/Matrix/joint_matrix_half_accumulator.cpp
@@ -15,7 +15,7 @@
 // REQUIRES: aspect-ext_intel_matrix
 // REQUIRES-INTEL-DRIVER: lin: 27868, win: 101.5181
 
-// XFAIL: gpu && (!igc-dev || gpu-intel-dg2)
+// XFAIL: gpu-intel-dg2
 // XFAIL-TRACKER: GSD-10112
 
 // RUN: %{build} -o %t.out
diff --git a/sycl/test-e2e/bindless_images/array/fetch_sampled_array.cpp b/sycl/test-e2e/bindless_images/array/fetch_sampled_array.cpp
index bd8541d636026..ad34c46a14108 100644
--- a/sycl/test-e2e/bindless_images/array/fetch_sampled_array.cpp
+++ b/sycl/test-e2e/bindless_images/array/fetch_sampled_array.cpp
@@ -2,6 +2,8 @@
 // REQUIRES: aspect-ext_oneapi_image_array
 // UNSUPPORTED: target-amd
 // UNSUPPORTED-INTENDED: image array not currently supported on AMD
+// UNSUPPORTED: linux && arch-intel_gpu_bmg_g21 && level_zero_v2_adapter
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20223
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
diff --git a/sycl/test-e2e/bindless_images/array/read_sampled_array.cpp b/sycl/test-e2e/bindless_images/array/read_sampled_array.cpp
index 88cf7336536b9..4519a25a94c88 100644
--- a/sycl/test-e2e/bindless_images/array/read_sampled_array.cpp
+++ b/sycl/test-e2e/bindless_images/array/read_sampled_array.cpp
@@ -4,6 +4,9 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
+// UNSUPPORTED: linux && arch-intel_gpu_bmg_g21 && level_zero_v2_adapter
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20223
+
 // Print test names and pass status.
 // #define VERBOSE_LV1
 
diff --git a/sycl/test-e2e/bindless_images/read_sampled.cpp b/sycl/test-e2e/bindless_images/read_sampled.cpp
index 67562e6e07254..c4b39ae12e96f 100644
--- a/sycl/test-e2e/bindless_images/read_sampled.cpp
+++ b/sycl/test-e2e/bindless_images/read_sampled.cpp
@@ -3,6 +3,9 @@
 // UNSUPPORTED: hip
 // UNSUPPORTED-INTENDED: Returning non-FP values from sampling fails on HIP.
 
+// UNSUPPORTED: linux && arch-intel_gpu_bmg_g21 && level_zero_v2_adapter
+// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20223
+
 // RUN: %{build} -o %t.out
 // RUN: %{run-unfiltered-devices} %t.out