diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index e2b9542e65..9c722a8838 100644
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -294,9 +294,6 @@
     <MsaFile>
       <Filename>Universal/PCD/Pei/Pcd.msa</Filename>
     </MsaFile>
-    <MsaFile>
-      <Filename>Universal/PCD/Test/PeiPcdTest.msa</Filename>
-    </MsaFile>
     <MsaFile>
       <Filename>Universal/PCD/Dxe/Pcd.msa</Filename>
     </MsaFile>
diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index e5bf153c7f..5fb363ccfd 100644
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -518,113 +518,6 @@
           </PcdData>
         </PcdBuildDefinition>
       </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeimPcdTest">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-          <PcdData ItemType="DYNAMIC">
-            <C_Name>PcdTestDynamicUint8</C_Name>
-            <Token>0x00011000</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1</Value>
-          </PcdData>
-          <PcdData ItemType="DYNAMIC">
-            <C_Name>PcdTestDynamicUint16</C_Name>
-            <Token>0x00011001</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT16</DatumType>
-            <MaxDatumSize>2</MaxDatumSize>
-            <Value>0x1234</Value>
-          </PcdData>
-          <PcdData ItemType="DYNAMIC">
-            <C_Name>PcdTestDynamicUint32</C_Name>
-            <Token>0x00011002</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0</Value>
-          </PcdData>
-          <PcdData ItemType="DYNAMIC">
-            <C_Name>PcdTestDynamicUint64</C_Name>
-            <Token>0x00011003</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT64</DatumType>
-            <MaxDatumSize>8</MaxDatumSize>
-            <Value>0</Value>
-          </PcdData>
-          <PcdData ItemType="DYNAMIC">
-            <C_Name>PcdTestDynamicBoolean</C_Name>
-            <Token>0x00011004</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>BOOLEAN</DatumType>
-            <Value>FALSE</Value>
-          </PcdData>
-        </PcdBuildDefinition>      
-      </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonoStatusCode">
         <PcdBuildDefinition>
           <PcdData ItemType="FIXED_AT_BUILD">