diff --git a/MdePkg/Test/UnitTest/Library/BaseLib/BaseLibUnitTestsUefi.inf b/MdePkg/Test/UnitTest/Library/BaseLib/BaseLibUnitTestsUefi.inf
index 907503898a..72f8b6292f 100644
--- a/MdePkg/Test/UnitTest/Library/BaseLib/BaseLibUnitTestsUefi.inf
+++ b/MdePkg/Test/UnitTest/Library/BaseLib/BaseLibUnitTestsUefi.inf
@@ -31,3 +31,6 @@
   UefiApplicationEntryPoint
   DebugLib
   UnitTestLib
+
+[BuildOptions]
+  NOOPT_CLANGPDB_*_DLINK_FLAGS = /force:unresolved
diff --git a/MdePkg/Test/UnitTest/Library/BaseSafeIntLib/TestBaseSafeIntLibDxe.inf b/MdePkg/Test/UnitTest/Library/BaseSafeIntLib/TestBaseSafeIntLibDxe.inf
index de67b04bd5..8a106d6ce7 100644
--- a/MdePkg/Test/UnitTest/Library/BaseSafeIntLib/TestBaseSafeIntLibDxe.inf
+++ b/MdePkg/Test/UnitTest/Library/BaseSafeIntLib/TestBaseSafeIntLibDxe.inf
@@ -43,3 +43,6 @@
 
 [Depex]
   TRUE
+
+[BuildOptions]
+  NOOPT_CLANGPDB_*_DLINK_FLAGS = /force:unresolved
diff --git a/MdePkg/Test/UnitTest/Library/BaseSafeIntLib/TestBaseSafeIntLibPei.inf b/MdePkg/Test/UnitTest/Library/BaseSafeIntLib/TestBaseSafeIntLibPei.inf
index c8ba4f44ef..9787c0ffbc 100644
--- a/MdePkg/Test/UnitTest/Library/BaseSafeIntLib/TestBaseSafeIntLibPei.inf
+++ b/MdePkg/Test/UnitTest/Library/BaseSafeIntLib/TestBaseSafeIntLibPei.inf
@@ -43,3 +43,6 @@
 
 [Depex]
   TRUE
+
+[BuildOptions]
+  NOOPT_CLANGPDB_*_DLINK_FLAGS = /force:unresolved
diff --git a/MdePkg/Test/UnitTest/Library/BaseSafeIntLib/TestBaseSafeIntLibSmm.inf b/MdePkg/Test/UnitTest/Library/BaseSafeIntLib/TestBaseSafeIntLibSmm.inf
index df7288501d..753719de27 100644
--- a/MdePkg/Test/UnitTest/Library/BaseSafeIntLib/TestBaseSafeIntLibSmm.inf
+++ b/MdePkg/Test/UnitTest/Library/BaseSafeIntLib/TestBaseSafeIntLibSmm.inf
@@ -43,3 +43,6 @@
 
 [Depex]
   TRUE
+
+[BuildOptions]
+  NOOPT_CLANGPDB_*_DLINK_FLAGS = /force:unresolved
diff --git a/MdePkg/Test/UnitTest/Library/BaseSafeIntLib/TestBaseSafeIntLibUefiShell.inf b/MdePkg/Test/UnitTest/Library/BaseSafeIntLib/TestBaseSafeIntLibUefiShell.inf
index 5a13c1c845..dccbc66855 100644
--- a/MdePkg/Test/UnitTest/Library/BaseSafeIntLib/TestBaseSafeIntLibUefiShell.inf
+++ b/MdePkg/Test/UnitTest/Library/BaseSafeIntLib/TestBaseSafeIntLibUefiShell.inf
@@ -40,3 +40,6 @@
   DebugLib
   SafeIntLib
   UnitTestLib
+
+[BuildOptions]
+  NOOPT_CLANGPDB_*_DLINK_FLAGS = /force:unresolved