 ++  gEfiTestRecoveryLibraryGuid
 +   gBlackBoxEfiHIIPackageListProtocolGuid
 +diff --git a/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTestConformance.c b/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTestConformance.c
-+index 4c63a08..6bd92ec 100644
++index 4c63a08..e19c609 100644
 +--- a/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTestConformance.c
 ++++ b/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/ImageBBTestConformance.c
 +@@ -809,6 +809,7 @@ BBTestExitBootServicesConsistencyTest (

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

+-                     0,                               // DataSize
+-                     Data                             // Data
+-                     );
++Done:
+ 
+   Status = ImageTestCheckForCleanEnvironment (&Numbers);
+   if (EFI_ERROR(Status)) {
+@@ -961,4 +981,3 @@ CheckResult:
+   }
+   return EFI_SUCCESS;
+ }
