diff --git a/EdkCompatibilityPkg/Compatibility/FvFileLoaderToLoadFileThunk/FvFileLoaderToLoadFileThunk.c b/EdkCompatibilityPkg/Compatibility/FvFileLoaderToLoadFileThunk/FvFileLoaderToLoadFileThunk.c
index 5f09a8d21b..70bc333d5d 100644
--- a/EdkCompatibilityPkg/Compatibility/FvFileLoaderToLoadFileThunk/FvFileLoaderToLoadFileThunk.c
+++ b/EdkCompatibilityPkg/Compatibility/FvFileLoaderToLoadFileThunk/FvFileLoaderToLoadFileThunk.c
@@ -78,6 +78,12 @@ InitPeim (
   IN CONST EFI_PEI_SERVICES  **PeiServices
   )
 {
+  //
+  // This thunk module can only be used together with a PI PEI core, as we 
+  // assume PeiServices Pointer Table can be located in a standard way defined
+  // in PI spec.
+  //
+  ASSERT ((*PeiServices)->Hdr.Revision >= 0x00010000);
   return (*PeiServices)->InstallPpi (PeiServices, &mPpiFrameworkLoadFile);
 }
 
diff --git a/EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2ToReadOnlyVariableThunk/ReadOnlyVariable2ToReadOnlyVariableThunk.c b/EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2ToReadOnlyVariableThunk/ReadOnlyVariable2ToReadOnlyVariableThunk.c
index 756787e27b..7e2ca126d1 100644
--- a/EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2ToReadOnlyVariableThunk/ReadOnlyVariable2ToReadOnlyVariableThunk.c
+++ b/EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2ToReadOnlyVariableThunk/ReadOnlyVariable2ToReadOnlyVariableThunk.c
@@ -101,6 +101,12 @@ Returns:
 {
   VOID        *Interface;
   EFI_STATUS  Status;
+  //
+  // This thunk module can only be used together with a PI PEI core, as we 
+  // assume PeiServices Pointer Table can be located in a standard way defined
+  // in PI spec.
+  //
+  ASSERT ((*PeiServices)->Hdr.Revision >= 0x00010000);
 
   //
   // Make sure ReadOnlyVariable2ToReadOnlyVariable module is not present. If so, the call chain will form a