diff --git a/MU_BASECORE b/MU_BASECORE
index 3f409b4f6f..15bfe89def 160000
--- a/MU_BASECORE
+++ b/MU_BASECORE
@@ -1 +1 @@
-Subproject commit 3f409b4f6f19a1cf29cf9da162a582705fc13027
+Subproject commit 15bfe89def5ce16ffece31841a73606a327ed643
diff --git a/Platforms/QemuQ35Pkg/QemuQ35PkgCommon.dsc.inc b/Platforms/QemuQ35Pkg/QemuQ35PkgCommon.dsc.inc
index 9d2b9c950e..4e1e4d794b 100644
--- a/Platforms/QemuQ35Pkg/QemuQ35PkgCommon.dsc.inc
+++ b/Platforms/QemuQ35Pkg/QemuQ35PkgCommon.dsc.inc
@@ -1284,6 +1284,8 @@ QemuQ35Pkg/Library/ResetSystemLib/StandaloneMmResetSystemLib.inf
       #be tested in more of a release mode environment
       gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0E
   }
+
+  MdePkg/Test/UnitTest/BootManagerPolicyProtocol/BootManagerPolicyProtocolTest.inf
 !endif
   #########################################
   # SMM Phase modules
diff --git a/Platforms/QemuSbsaPkg/QemuSbsaPkg.dsc b/Platforms/QemuSbsaPkg/QemuSbsaPkg.dsc
index 7e44ecd2d6..72495e6502 100644
--- a/Platforms/QemuSbsaPkg/QemuSbsaPkg.dsc
+++ b/Platforms/QemuSbsaPkg/QemuSbsaPkg.dsc
@@ -1188,6 +1188,7 @@
     MdeModulePkg/Test/ShellTest/VariablePolicyFuncTestApp/VariablePolicyFuncTestApp.inf
   !endif
   # UefiTestingPkg/FunctionalSystemTests/MemoryAttributeProtocolFuncTestApp/MemoryAttributeProtocolFuncTestApp.inf # PROTOCOL NOT AVAILABLE ON SBSA
+  MdePkg/Test/UnitTest/BootManagerPolicyProtocol/BootManagerPolicyProtocolTest.inf
   MdePkg/Test/UnitTest/Library/BaseLib/BaseLibUnitTestApp.inf
   MdePkg/Test/UnitTest/Library/BaseSafeIntLib/TestBaseSafeIntLibTestApp.inf
   MfciPkg/UnitTests/MfciPolicyParsingUnitTest/MfciPolicyParsingUnitTestApp.inf
@@ -1229,6 +1230,7 @@
       #be tested in more of a release mode environment
       gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0E
   }
+  
 !endif
 
   #