    {
      MEMORY_ALLOCATION_SERVICES_GETMEMORYMAP_STRESS_TEST_GUID,
 diff --git a/SctPkg/TestCase/UEFI/EFI/BootServices/SbbrBootServices/BlackBoxTest/SbbrBootServicesBBTestFunction.c b/SctPkg/TestCase/UEFI/EFI/BootServices/SbbrBootServices/BlackBoxTest/SbbrBootServicesBBTestFunction.c
-index c88d60b..782d5a5 100644
+index c88d60b..6fbd11a 100644
 --- a/SctPkg/TestCase/UEFI/EFI/BootServices/SbbrBootServices/BlackBoxTest/SbbrBootServicesBBTestFunction.c
 +++ b/SctPkg/TestCase/UEFI/EFI/BootServices/SbbrBootServices/BlackBoxTest/SbbrBootServicesBBTestFunction.c
-@@ -233,23 +233,6 @@ BBTestMemoryMapTest (
+@@ -235,6 +235,7 @@ BBTestMemoryMapTest (
+     //
+     // Checking for 64KB alignment
+     //
++	/*
+     if (MemoryMapDescriptor->PhysicalStart & (SIZE_64KB - 1)) {
+       StandardLib->RecordAssertion (
+                   StandardLib,
+@@ -248,6 +249,7 @@ BBTestMemoryMapTest (
+                   );
+       error = TRUE;
      }
++	*/
  
      //
--    // Checking for 64KB alignment
--    //
--    if (MemoryMapDescriptor->PhysicalStart & (SIZE_64KB - 1)) {
--      StandardLib->RecordAssertion (
--                  StandardLib,
--                  EFI_TEST_ASSERTION_FAILED,
--                  gSbbrBootServicesAssertion001Guid,
--                  L"MemoryMap",
--                  L"%a:%d - MemoryMap 0x%X Not Aligned to 64KB",
--                  __FILE__,
--                  __LINE__,
--                  MemoryMapDescriptor
--                  );
--      error = TRUE;
--    }
--
--    //
      // No issues found
-     //
-     if (error == FALSE) {
 diff --git a/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/Dependency/Config/EfiCompliant.ini b/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/Dependency/Config/EfiCompliant.ini
 index 72e959d..e37a8d6 100644
 --- a/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/Dependency/Config/EfiCompliant.ini

     SYSENVCONFIG_OS_DISK_FORMAT_GUID,
     L"OsDiskFormat",
     L"Checking that the operating system disk contains a GPT partition table with an EFI partition.",
@@ -99,15 +90,6 @@ EFI_BB_TEST_ENTRY_FIELD gBBTestEntryField[] = {
     EFI_TEST_CASE_AUTO,
     BBTestOsDiskFormatTest
   },

-  } else {
-    AssertionType = EFI_TEST_ASSERTION_FAILED;
-  }
 
-  Status = gtRT->SetVariable (
-                     L"ExitBootServicesTestVariable",                                                           // VariableName
-                     &gTestVendor1Guid,                                                                         // VendorGuid
