diff --git a/MsCorePkg/MsCorePkg.dec b/MsCorePkg/MsCorePkg.dec
index 5046d9f998..72e6144e51 100644
--- a/MsCorePkg/MsCorePkg.dec
+++ b/MsCorePkg/MsCorePkg.dec
@@ -18,7 +18,7 @@
 
 [Includes]
   Include
-  UnitTests/Mock/Include
+  Test/Mock/Include
 
 [LibraryClasses]
 
diff --git a/MsCorePkg/UnitTests/Mock/Include/GoogleTest/Library/MockDeviceBootManagerLib.h b/MsCorePkg/Test/Mock/Include/GoogleTest/Library/MockDeviceBootManagerLib.h
similarity index 100%
rename from MsCorePkg/UnitTests/Mock/Include/GoogleTest/Library/MockDeviceBootManagerLib.h
rename to MsCorePkg/Test/Mock/Include/GoogleTest/Library/MockDeviceBootManagerLib.h
diff --git a/MsCorePkg/UnitTests/Mock/Library/MockDeviceBootManagerLib/MockDeviceBootManagerLib.cpp b/MsCorePkg/Test/Mock/Library/GoogleTest/MockDeviceBootManagerLib/MockDeviceBootManagerLib.cpp
similarity index 100%
rename from MsCorePkg/UnitTests/Mock/Library/MockDeviceBootManagerLib/MockDeviceBootManagerLib.cpp
rename to MsCorePkg/Test/Mock/Library/GoogleTest/MockDeviceBootManagerLib/MockDeviceBootManagerLib.cpp
diff --git a/MsCorePkg/UnitTests/Mock/Library/MockDeviceBootManagerLib/MockDeviceBootManagerLib.inf b/MsCorePkg/Test/Mock/Library/GoogleTest/MockDeviceBootManagerLib/MockDeviceBootManagerLib.inf
similarity index 100%
rename from MsCorePkg/UnitTests/Mock/Library/MockDeviceBootManagerLib/MockDeviceBootManagerLib.inf
rename to MsCorePkg/Test/Mock/Library/GoogleTest/MockDeviceBootManagerLib/MockDeviceBootManagerLib.inf
diff --git a/MsCorePkg/UnitTests/MsCorePkgHostTest.dsc b/MsCorePkg/UnitTests/MsCorePkgHostTest.dsc
index af365fe8d6..ba231623df 100644
--- a/MsCorePkg/UnitTests/MsCorePkgHostTest.dsc
+++ b/MsCorePkg/UnitTests/MsCorePkgHostTest.dsc
@@ -46,7 +46,7 @@
 [Components]
     MsCorePkg/MacAddressEmulationDxe/Test/MacAddressEmulationDxeHostTest.inf
 
-    MsCorePkg/UnitTests/Mock/Library/MockDeviceBootManagerLib/MockDeviceBootManagerLib.inf
+    MsCorePkg/Test/Mock/Library/GoogleTest/MockDeviceBootManagerLib/MockDeviceBootManagerLib.inf
 
 [BuildOptions]
   *_*_*_CC_FLAGS            = -D DISABLE_NEW_DEPRECATED_INTERFACES