diff --git a/EdkModulePkg/Universal/PCD/Test/PeiPcdTest.mbd b/EdkModulePkg/Universal/PCD/Test/PeiPcdTest.mbd
new file mode 100644
index 0000000000..e601061991
--- /dev/null
+++ b/EdkModulePkg/Universal/PCD/Test/PeiPcdTest.mbd
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+  <MbdHeader>
+    <BaseName>PeimPcdTesty</BaseName>
+    <Guid>7AB59E15-BA5A-4617-B562-BA428D002082</Guid>
+    <Version>EDK_RELEASE_VERSION        0x00020000</Version>
+    <Description>FIX ME!</Description>
+    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
+    <License>
+      All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+    </License>
+    <Created>2006-03-14 17:04</Created>
+    <Modified>2006-03-24 18:54</Modified>
+  </MbdHeader>
+  <Libraries>
+    <Library>PeimEntryPoint</Library>
+    <Library>BaseLib</Library>
+    <Library>PeiCoreLib</Library>
+    <Library>PeiServicesTablePointerLib</Library>
+    <Library>BaseDebugLibReportStatusCode</Library>
+    <Library>PeiMemoryLib</Library>
+    <Library>PeiReportStatusCodeLib</Library>
+    <Library>PeiMemoryAllocationLib</Library>
+    <Library>PeiPcdLib</Library>
+  </Libraries>
+</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/PCD/Test/PeiPcdTest.msa b/EdkModulePkg/Universal/PCD/Test/PeiPcdTest.msa
new file mode 100644
index 0000000000..51557e36a6
--- /dev/null
+++ b/EdkModulePkg/Universal/PCD/Test/PeiPcdTest.msa
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+  <MsaHeader>
+    <BaseName>PeimPcdTest</BaseName>
+    <ModuleType>PEIM</ModuleType>
+    <ComponentType>PE32_PEIM</ComponentType>
+    <Guid>B5B62DC2-4420-403a-A068-6E126053A166</Guid>
+    <Version>EDK_RELEASE_VERSION        0x00020000</Version>
+    <Abstract>Component description file for Pcd Database PEIM module</Abstract>
+    <Description>FIX ME!</Description>
+    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
+    <License>
+      All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+    </License>
+    <Specification>EFI_SPECIFICATION_VERSION    0x00000000</Specification>
+    <Created>2006-03-14 17:04</Created>
+    <Updated>2006-03-24 18:54</Updated>
+  </MsaHeader>
+  <LibraryClassDefinitions>
+    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">PeimEntryPoint</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">PcdLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesTablePointerLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
+  </LibraryClassDefinitions>
+  <SourceFiles>
+    <Filename>PcdTest.c</Filename>
+  </SourceFiles>
+  <Includes>
+    <PackageName>MdePkg</PackageName>
+    <PackageName>EdkModulePkg</PackageName>
+  </Includes>
+  <Hobs>
+    <Hob Usage="ALWAYS_PRODUCED" HobType="GUID_EXTENSION">
+      <Name>PcdDataBaseHob</Name>
+      <C_Name>gPcdDataBaseHobGuid</C_Name>
+      <Guid>0xea296d92, 0xb69,  0x423c, 0x8c, 0x28, 0x33, 0xb4, 0xe0, 0xa9, 0x12, 0x68</Guid>
+    </Hob>
+    <Hob Usage="ALWAYS_PRODUCED" HobType="GUID_EXTENSION">
+      <Name>PcdPeiCallbackFnTable</Name>
+      <C_Name>gPcdPeiCallbackFnTableHobGuid</C_Name>
+      <Guid>0xc625f4b2, 0xea09, 0x4675, 0x82, 0xd7, 0xba, 0x36, 0x82, 0x15, 0x7a, 0x14</Guid>
+    </Hob>
+  </Hobs>
+  <PPIs>
+    <Ppi Usage="ALWAYS_PRODUCED">Pcd</Ppi>
+    <Ppi Usage="ALWAYS_CONSUMED">ReadOnlyVariable</Ppi>
+  </PPIs>
+  <Externs>
+    <Extern>
+      <ModuleEntryPoint>PcdTestPeimInit</ModuleEntryPoint>
+    </Extern>
+  </Externs>
+  <PCDs>
+    <PcdData ItemType="FIXED_AT_BUILD">
+      <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
+      <Token>0x0001000f</Token>
+      <DatumType>UINT32</DatumType>
+    </PcdData>
+    <PcdData ItemType="DYNAMIC">
+      <C_Name>PcdTestDynamicUint8</C_Name>
+      <Token>0x00011000</Token>
+      <DatumType>UINT8</DatumType>
+    </PcdData>
+    <PcdData ItemType="DYNAMIC">
+      <C_Name>PcdTestDynamicUint16</C_Name>
+      <Token>0x00011001</Token>
+      <DatumType>UINT16</DatumType>
+    </PcdData>
+    <PcdData ItemType="DYNAMIC">
+      <C_Name>PcdTestDynamicUint32</C_Name>
+      <Token>0x00011002</Token>
+      <DatumType>UINT32</DatumType>
+    </PcdData>
+    <PcdData ItemType="DYNAMIC">
+      <C_Name>PcdTestDynamicUint64</C_Name>
+      <Token>0x00011003</Token>
+      <DatumType>UINT64</DatumType>
+    </PcdData>
+    <PcdData ItemType="DYNAMIC">
+      <C_Name>PcdTestDynamicBoolean</C_Name>
+      <Token>0x00011004</Token>
+      <DatumType>BOOLEAN</DatumType>
+    </PcdData>
+  </PCDs>
+</ModuleSurfaceArea>
diff --git a/EdkModulePkg/Universal/PCD/Test/build.xml b/EdkModulePkg/Universal/PCD/Test/build.xml
new file mode 100644
index 0000000000..e271f5d2e4
--- /dev/null
+++ b/EdkModulePkg/Universal/PCD/Test/build.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2006, Intel Corporation 
+All rights reserved. This program and the accompanying materials 
+are licensed and made available under the terms and conditions of the BSD License 
+which accompanies this distribution.  The full text of the license may be found at  
+http://opensource.org/licenses/bsd-license.php 
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<project basedir="." default="PeimPcdTest"><!--Apply external ANT tasks-->
+   <taskdef resource="GenBuild.tasks"/>
+   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+   <property environment="env"/>
+   <property name="WORKSPACE_DIR" value="${env.WORKSPACE}"/>
+   <import file="${WORKSPACE_DIR}\Tools\Conf\BuildMacro.xml"/><!--MODULE_RELATIVE PATH is relative to PACKAGE_DIR-->
+   <property name="MODULE_RELATIVE_PATH" value="Universal\PCD\Test"/>
+   <property name="MODULE_DIR" value="${PACKAGE_DIR}\${MODULE_RELATIVE_PATH}"/>
+   <property name="COMMON_FILE" value="${WORKSPACE_DIR}\Tools\Conf\Common.xml"/>
+   <target name="PeimPcdTest">
+      <GenBuild baseName="PeimPcdTest" mbdFilename="${MODULE_DIR}\PeiPcdTest.mbd" msaFilename="${MODULE_DIR}\PeiPcdTest.msa"/>
+   </target>
+   <target depends="PeimPcdTest_clean" name="clean"/>
+   <target depends="PeimPcdTest_cleanall" name="cleanall"/>
+   <target name="PeimPcdTest_clean">
+      <OutputDirSetup baseName="PeimPcdTest" mbdFilename="${MODULE_DIR}\PeiPcdTest.mbd" msaFilename="${MODULE_DIR}\PeiPcdTest.msa"/>
+      <if>
+         <available file="${DEST_DIR_OUTPUT}\PeimPcdTest_build.xml"/>
+         <then>
+            <ant antfile="${DEST_DIR_OUTPUT}\PeimPcdTest_build.xml" target="clean"/>
+         </then>
+      </if>
+      <delete dir="${DEST_DIR_OUTPUT}" excludes="*.xml"/>
+   </target>
+   <target name="PeimPcdTest_cleanall">
+      <OutputDirSetup baseName="PeimPcdTest" mbdFilename="${MODULE_DIR}\PeiPcdTest.mbd" msaFilename="${MODULE_DIR}\PeiPcdTest.msa"/>
+      <if>
+         <available file="${DEST_DIR_OUTPUT}\PeimPcdTest_build.xml"/>
+         <then>
+            <ant antfile="${DEST_DIR_OUTPUT}\PeimPcdTest_build.xml" target="cleanall"/>
+         </then>
+      </if>
+      <delete dir="${DEST_DIR_OUTPUT}"/>
+      <delete dir="${DEST_DIR_DEBUG}"/>
+      <delete>
+         <fileset dir="${BIN_DIR}" includes="**PeimPcdTest*"/>
+      </delete>
+   </target>
+</project>
\ No newline at end of file