diff --git a/UnitTestFrameworkPkg/ReadMe.md b/UnitTestFrameworkPkg/ReadMe.md
index c7efd4e38d..809e6d12a9 100644
--- a/UnitTestFrameworkPkg/ReadMe.md
+++ b/UnitTestFrameworkPkg/ReadMe.md
@@ -1397,7 +1397,7 @@ you should be good to go.
 
 See this example in 'SampleGoogleTestHost.inf'...
 
-```
+```inf
 [Packages]
   MdePkg/MdePkg.dec
   UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec
@@ -1411,7 +1411,7 @@ See this example in 'SampleGoogleTestHost.inf'...
 Also, if you want you test to automatically be picked up by the Test Runner plugin, you will need
 to make sure that the module `BASE_NAME` contains the word `Test`...
 
-```
+```inf
 [Defines]
   BASE_NAME      = SampleGoogleTestHost
 ```
@@ -1420,7 +1420,7 @@ to make sure that the module `BASE_NAME` contains the word `Test`...
 
 Not to state the obvious, but let's make sure we have the following include before getting too far along...
 
-```
+```c
 #include <gtest/gtest.h>
 extern "C" {
   #include <Uefi.h>
@@ -1662,7 +1662,7 @@ Unit test applications using Framework are built using Cmocka that requires the
 following environment variables to be set to generate structured XML output
 rather than text:
 
-```
+```inf
 CMOCKA_MESSAGE_OUTPUT=xml
 CMOCKA_XML_FILE=<absolute or relative path to output file>
 ```
@@ -1670,7 +1670,7 @@ CMOCKA_XML_FILE=<absolute or relative path to output file>
 Unit test applications using GoogleTest require the following environment
 variable to be set to generate structured XML output rather than text:
 
-```
+```inf
 GTEST_OUTPUT=xml:<absolute or relative path to output file>
 ```
 
diff --git a/UnitTestFrameworkPkg/UnitTestFrameworkPkg.ci.yaml b/UnitTestFrameworkPkg/UnitTestFrameworkPkg.ci.yaml
index 0ef355349d..ab1f64f14a 100644
--- a/UnitTestFrameworkPkg/UnitTestFrameworkPkg.ci.yaml
+++ b/UnitTestFrameworkPkg/UnitTestFrameworkPkg.ci.yaml
@@ -106,7 +106,9 @@
             "mdkinney",     # Contact GitHub account in Readme
             "spbrogan",     # Contact GitHub account in Readme
             "cobertura",    # tool for code coverage
-            "pycobertura"   # tool for code coverage
+            "pycobertura",  # tool for code coverage
+            "loongarch",
+            "loongson"
         ],
         "IgnoreStandardPaths": [],   # Standard Plugin defined paths that should be ignore
         "AdditionalIncludePaths": [] # Additional paths to spell check (wildcards supported)
@@ -114,7 +116,9 @@
 
     ## options defined .pytool/Plugin/MarkdownLintCheck
     "MarkdownLintCheck": {
-        "IgnoreFiles": [ "Library/CmockaLib/cmocka"  # cmocka is submodule outside of control
-        ]            # package root relative file, folder, or glob pattern to ignore
+        "IgnoreFiles": [
+          "Library/CmockaLib/cmocka",         # cmocka is submodule outside of control
+          "Library/GoogleTestLib/googletest"  # googletest is submodule outside of control
+        ] # package root relative file, folder, or glob pattern to ignore
     }
 }
diff --git a/UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec b/UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec
index 9d7672fe35..f4688ab85c 100644
--- a/UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec
+++ b/UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec
@@ -53,10 +53,6 @@
   #
   UnitTestBootLib|PrivateInclude/Library/UnitTestBootLib.h
 
-  ## @libraryclass GoogleTest infrastructure
-  #
-  GoogleTestLib|Include/Library/GoogleTestLib.h
-
 [Guids]
   gUnitTestFrameworkPkgTokenSpaceGuid = { 0x833d3aba, 0x39b4, 0x43a2, { 0xb9, 0x30, 0x7a, 0x34, 0x53, 0x39, 0x31, 0xb3 } }