diff --git a/docs/arm_sbsa_testcase_checklist.rst b/docs/arm_sbsa_testcase_checklist.rst
index 16e8a361..5f6b3465 100644
--- a/docs/arm_sbsa_testcase_checklist.rst
+++ b/docs/arm_sbsa_testcase_checklist.rst
@@ -79,10 +79,6 @@ The below table provides the following details
 +-------+--------------------------------------------+-----+----------------------------------------------------+----------------+----+----------+-----+-------------------+
 |34     |Check for SVE Int8 matrix multiplc          |L7   |S_L7PE_07                                           |Yes             |Yes |Yes       |No   |No                 |
 +-------+--------------------------------------------+-----+----------------------------------------------------+----------------+----+----------+-----+-------------------+
-|35     |Check for data gathering hint               |L7   |S_L7PE_08                                           |Yes             |Yes |Yes       |No   |No                 |
-+-------+--------------------------------------------+-----+----------------------------------------------------+----------------+----+----------+-----+-------------------+
-|36     |Check WFE Fine tune delay feature           |L7   |S_L7PE_09                                           |Yes             |Yes |Yes       |No   |No                 |
-+-------+--------------------------------------------+-----+----------------------------------------------------+----------------+----+----------+-----+-------------------+
 |37     |Check for enhanced PAN feature              |FR   |S_L8PE_04                                           |Yes             |Yes |Yes       |No   |No                 |
 +-------+--------------------------------------------+-----+----------------------------------------------------+----------------+----+----------+-----+-------------------+
 |38     |Check XS attribute functionality            |FR   |S_L8PE_01                                           |Yes             |Yes |Yes       |No   |No                 |
diff --git a/uefi_app/SbsaAvs.inf b/uefi_app/SbsaAvs.inf
index 30f24029..06193040 100644
--- a/uefi_app/SbsaAvs.inf
+++ b/uefi_app/SbsaAvs.inf
@@ -64,8 +64,6 @@
   ../test_pool/pe/operating_system/test_c032.c
   ../test_pool/pe/operating_system/test_c033.c
   ../test_pool/pe/operating_system/test_c034.c
-  ../test_pool/pe/operating_system/test_c035.c
-  ../test_pool/pe/operating_system/test_c036.c
   ../test_pool/pe/operating_system/test_c037.c
   ../test_pool/pe/operating_system/test_c038.c
   ../test_pool/pe/operating_system/test_c039.c
diff --git a/uefi_app/SbsaAvsNist.inf b/uefi_app/SbsaAvsNist.inf
index 2b33c939..438c0b02 100644
--- a/uefi_app/SbsaAvsNist.inf
+++ b/uefi_app/SbsaAvsNist.inf
@@ -64,8 +64,6 @@
   ../test_pool/pe/operating_system/test_c032.c
   ../test_pool/pe/operating_system/test_c033.c
   ../test_pool/pe/operating_system/test_c034.c
-  ../test_pool/pe/operating_system/test_c035.c
-  ../test_pool/pe/operating_system/test_c036.c
   ../test_pool/pe/operating_system/test_c037.c
   ../test_pool/pe/operating_system/test_c038.c
   ../test_pool/pe/operating_system/test_c039.c