diff --git a/sycl/test-e2e/Matrix/SG32/joint_matrix_annotated_ptr.cpp b/sycl/test-e2e/Matrix/SG32/joint_matrix_annotated_ptr.cpp
index 21f101e000b52..13656b8e3f4ec 100644
--- a/sycl/test-e2e/Matrix/SG32/joint_matrix_annotated_ptr.cpp
+++ b/sycl/test-e2e/Matrix/SG32/joint_matrix_annotated_ptr.cpp
@@ -13,6 +13,7 @@
 
 // Currently row major B fails when annotated_ptr is used
 // XFAIL: gpu
+// XFAIL-TRACKER: GSD-4181
 
 #include "../common.hpp"
 
diff --git a/sycl/test-e2e/Matrix/SG32/joint_matrix_bfloat16_colmajorA_colmajorB.cpp b/sycl/test-e2e/Matrix/SG32/joint_matrix_bfloat16_colmajorA_colmajorB.cpp
index aba19833ee581..57a41d55f8fee 100644
--- a/sycl/test-e2e/Matrix/SG32/joint_matrix_bfloat16_colmajorA_colmajorB.cpp
+++ b/sycl/test-e2e/Matrix/SG32/joint_matrix_bfloat16_colmajorA_colmajorB.cpp
@@ -15,7 +15,7 @@
 // then VNNI transform. This is currently only available on AMX
 
 // XFAIL: gpu
-
+// XFAIL-TRACKER: GSD-5768
 #include "../common.hpp"
 #include <iostream>
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/Matrix/SG32/joint_matrix_bfloat16_packedB.cpp b/sycl/test-e2e/Matrix/SG32/joint_matrix_bfloat16_packedB.cpp
index 36346ba4a9f1a..1944a331bfe3a 100644
--- a/sycl/test-e2e/Matrix/SG32/joint_matrix_bfloat16_packedB.cpp
+++ b/sycl/test-e2e/Matrix/SG32/joint_matrix_bfloat16_packedB.cpp
@@ -15,6 +15,7 @@
 // RUN: %{run} %t.out
 
 // XFAIL: gpu
+// XFAIL-TRACKER: GSD-4181
 
 #include "../common.hpp"
 
diff --git a/sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp b/sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp
index 0c3b778457036..4186ad1acc943 100644
--- a/sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp
+++ b/sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp
@@ -12,6 +12,7 @@
 // RUN: %{run} %t.out
 
 // XFAIL: run-mode
+// XFAIL-TRACKER: GSD-5768
 
 #include "../common.hpp"
 
diff --git a/sycl/test-e2e/Matrix/SG32/joint_matrix_int8_colmajorA_colmajorB.cpp b/sycl/test-e2e/Matrix/SG32/joint_matrix_int8_colmajorA_colmajorB.cpp
index 177e4d6d861fa..7db1b0a618823 100644
--- a/sycl/test-e2e/Matrix/SG32/joint_matrix_int8_colmajorA_colmajorB.cpp
+++ b/sycl/test-e2e/Matrix/SG32/joint_matrix_int8_colmajorA_colmajorB.cpp
@@ -15,6 +15,7 @@
 // then VNNI transform. This is currently only available on AMX
 
 // XFAIL: gpu
+// XFAIL-TRACKER: GSD-5768
 
 #include "../common.hpp"
 
diff --git a/sycl/test-e2e/Matrix/SG32/joint_matrix_int8_rowmajorA_rowmajorB.cpp b/sycl/test-e2e/Matrix/SG32/joint_matrix_int8_rowmajorA_rowmajorB.cpp
index d73a2300888d3..3068b6bcca684 100644
--- a/sycl/test-e2e/Matrix/SG32/joint_matrix_int8_rowmajorA_rowmajorB.cpp
+++ b/sycl/test-e2e/Matrix/SG32/joint_matrix_int8_rowmajorA_rowmajorB.cpp
@@ -14,6 +14,7 @@
 // RUN: %{run} %t.out
 
 // XFAIL: gpu
+// XFAIL-TRACKER: GSD-4181
 
 #include "../common.hpp"
 
diff --git a/sycl/test-e2e/Matrix/SG32/joint_matrix_out_bounds.cpp b/sycl/test-e2e/Matrix/SG32/joint_matrix_out_bounds.cpp
index 3464677d17398..97a6d17b4e1ee 100644
--- a/sycl/test-e2e/Matrix/SG32/joint_matrix_out_bounds.cpp
+++ b/sycl/test-e2e/Matrix/SG32/joint_matrix_out_bounds.cpp
@@ -14,6 +14,7 @@
 // RUN: %{run} %t.out
 
 // XFAIL:gpu
+// XFAIL-TRACKER: GSD-4181
 
 #include "../common.hpp"
 
diff --git a/sycl/test-e2e/Matrix/SG32/joint_matrix_prefetch.cpp b/sycl/test-e2e/Matrix/SG32/joint_matrix_prefetch.cpp
index a6ce09fe13b9f..7e1520e95ff1c 100644
--- a/sycl/test-e2e/Matrix/SG32/joint_matrix_prefetch.cpp
+++ b/sycl/test-e2e/Matrix/SG32/joint_matrix_prefetch.cpp
@@ -11,6 +11,7 @@
 // RUN: %{run} %t.out
 
 // XFAIL: gpu
+// XFAIL-TRACKER: GSD-4181
 
 // SG size = 32 is not currently supported for SYCL Joint Matrix by IGC on DG2
 // UNSUPPORTED: gpu-intel-dg2
diff --git a/sycl/test-e2e/Matrix/SG32/joint_matrix_rowmajorA_rowmajorB.cpp b/sycl/test-e2e/Matrix/SG32/joint_matrix_rowmajorA_rowmajorB.cpp
index 0fe45a24c499f..ca7310f6f5e15 100644
--- a/sycl/test-e2e/Matrix/SG32/joint_matrix_rowmajorA_rowmajorB.cpp
+++ b/sycl/test-e2e/Matrix/SG32/joint_matrix_rowmajorA_rowmajorB.cpp
@@ -16,6 +16,7 @@
 
 // Sub-group size 32 support for this test is not currently available in IGC
 // XFAIL: gpu
+// XFAIL-TRACKER: GSD-4181
 
 #include "../common.hpp"
 
diff --git a/sycl/test-e2e/Matrix/SG32/joint_matrix_unaligned_k.cpp b/sycl/test-e2e/Matrix/SG32/joint_matrix_unaligned_k.cpp
index ceb196e07b9ca..342648810fea4 100644
--- a/sycl/test-e2e/Matrix/SG32/joint_matrix_unaligned_k.cpp
+++ b/sycl/test-e2e/Matrix/SG32/joint_matrix_unaligned_k.cpp
@@ -14,6 +14,7 @@
 // RUN: %{run} %t.out
 
 // XFAIL:gpu
+// XFAIL-TRACKER: GSD-4181
 
 #include "../common.hpp"
 
diff --git a/sycl/test-e2e/Matrix/joint_matrix_bfloat16_colmajorA_colmajorB.cpp b/sycl/test-e2e/Matrix/joint_matrix_bfloat16_colmajorA_colmajorB.cpp
index a9326e2ba312b..82bedf7043e9d 100644
--- a/sycl/test-e2e/Matrix/joint_matrix_bfloat16_colmajorA_colmajorB.cpp
+++ b/sycl/test-e2e/Matrix/joint_matrix_bfloat16_colmajorA_colmajorB.cpp
@@ -14,6 +14,7 @@
 // then VNNI transform. This is currently only available on AMX
 
 // XFAIL: gpu
+// XFAIL-TRACKER: GSD-5768
 
 #include "common.hpp"
 
diff --git a/sycl/test-e2e/Matrix/joint_matrix_colA_rowB_colC.cpp b/sycl/test-e2e/Matrix/joint_matrix_colA_rowB_colC.cpp
index 338564207c4ac..c62175a8af439 100644
--- a/sycl/test-e2e/Matrix/joint_matrix_colA_rowB_colC.cpp
+++ b/sycl/test-e2e/Matrix/joint_matrix_colA_rowB_colC.cpp
@@ -11,6 +11,7 @@
 // RUN: %{run} %t.out
 
 // XFAIL: run-mode
+// XFAIL-TRACKER: GSD-5768
 
 #include "common.hpp"
 
diff --git a/sycl/test-e2e/Matrix/joint_matrix_int8_colmajorA_colmajorB.cpp b/sycl/test-e2e/Matrix/joint_matrix_int8_colmajorA_colmajorB.cpp
index f8dc8452668a1..aa4bac536e357 100644
--- a/sycl/test-e2e/Matrix/joint_matrix_int8_colmajorA_colmajorB.cpp
+++ b/sycl/test-e2e/Matrix/joint_matrix_int8_colmajorA_colmajorB.cpp
@@ -14,6 +14,7 @@
 // then VNNI transform. This is currently only available on AMX
 
 // XFAIL: gpu
+// XFAIL-TRACKER: GSD-5768
 
 #include "common.hpp"
 
diff --git a/sycl/test/e2e_test_requirements/no-xfail-without-tracker.cpp b/sycl/test/e2e_test_requirements/no-xfail-without-tracker.cpp
index c0355385350d5..4134c192bebb0 100644
--- a/sycl/test/e2e_test_requirements/no-xfail-without-tracker.cpp
+++ b/sycl/test/e2e_test_requirements/no-xfail-without-tracker.cpp
@@ -51,7 +51,7 @@
 // tests to match the required format and in that case you should just update
 // (i.e. reduce) the number and the list below.
 //
-// NUMBER-OF-XFAIL-WITHOUT-TRACKER: 31
+// NUMBER-OF-XFAIL-WITHOUT-TRACKER: 18
 //
 // List of improperly XFAIL-ed tests.
 // Remove the CHECK once the test has been properly XFAIL-ed.
@@ -62,19 +62,6 @@
 // CHECK-NEXT: DeviceLib/assert-windows.cpp
 // CHECK-NEXT: ESIMD/hardware_dispatch.cpp
 // CHECK-NEXT: InlineAsm/asm_multiple_instructions.cpp
-// CHECK-NEXT: Matrix/SG32/joint_matrix_annotated_ptr.cpp
-// CHECK-NEXT: Matrix/SG32/joint_matrix_bfloat16_colmajorA_colmajorB.cpp
-// CHECK-NEXT: Matrix/SG32/joint_matrix_bfloat16_packedB.cpp
-// CHECK-NEXT: Matrix/SG32/joint_matrix_colA_rowB_colC.cpp
-// CHECK-NEXT: Matrix/SG32/joint_matrix_int8_colmajorA_colmajorB.cpp
-// CHECK-NEXT: Matrix/SG32/joint_matrix_int8_rowmajorA_rowmajorB.cpp
-// CHECK-NEXT: Matrix/SG32/joint_matrix_out_bounds.cpp
-// CHECK-NEXT: Matrix/SG32/joint_matrix_prefetch.cpp
-// CHECK-NEXT: Matrix/SG32/joint_matrix_rowmajorA_rowmajorB.cpp
-// CHECK-NEXT: Matrix/SG32/joint_matrix_unaligned_k.cpp
-// CHECK-NEXT: Matrix/joint_matrix_bfloat16_colmajorA_colmajorB.cpp
-// CHECK-NEXT: Matrix/joint_matrix_colA_rowB_colC.cpp
-// CHECK-NEXT: Matrix/joint_matrix_int8_colmajorA_colmajorB.cpp
 // CHECK-NEXT: NewOffloadDriver/multisource.cpp
 // CHECK-NEXT: NewOffloadDriver/split-per-source-main.cpp
 // CHECK-NEXT: NewOffloadDriver/sycl-external-with-optional-features.cpp