diff --git a/core/java/android/content/pm/TEST_MAPPING b/core/java/android/content/pm/TEST_MAPPING
index 0d8fdcc4138fe..cc4782ad4a794 100644
--- a/core/java/android/content/pm/TEST_MAPPING
+++ b/core/java/android/content/pm/TEST_MAPPING
@@ -1,5 +1,14 @@
 {
   "imports": [
+    {
+      "path": "frameworks/base/services/tests/PackageManagerServiceTests"
+    },
+    {
+      "path": "frameworks/base/services/tests/PackageManager"
+    },
+    {
+      "path": "frameworks/base/services/tests/PackageManagerComponentOverrideTests"
+    },
     {
       "path": "cts/tests/tests/packageinstaller"
     },
diff --git a/services/core/java/com/android/server/pm/TEST_MAPPING b/services/core/java/com/android/server/pm/TEST_MAPPING
index c8deffbf257ad..d54acb7d6bd60 100644
--- a/services/core/java/com/android/server/pm/TEST_MAPPING
+++ b/services/core/java/com/android/server/pm/TEST_MAPPING
@@ -20,9 +20,6 @@
     {
       "name": "CtsAppEnumerationTestCases"
     },
-    {
-      "name": "AppEnumerationInternalTests"
-    },
     {
       "name": "CtsMatchFlagTestCases"
     },
diff --git a/services/tests/PackageManager/TEST_MAPPING b/services/tests/PackageManager/TEST_MAPPING
new file mode 100644
index 0000000000000..72d4c828c4529
--- /dev/null
+++ b/services/tests/PackageManager/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+  "presubmit": [
+    {
+      "name": "PackageInstallerTests"
+    }
+  ]
+}
+
diff --git a/services/tests/PackageManagerComponentOverrideTests/TEST_MAPPING b/services/tests/PackageManagerComponentOverrideTests/TEST_MAPPING
new file mode 100644
index 0000000000000..528c949f36de5
--- /dev/null
+++ b/services/tests/PackageManagerComponentOverrideTests/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+  "presubmit": [
+    {
+      "name": "PackageManagerComponentOverrideTests"
+    }
+  ]
+}
+
diff --git a/services/tests/PackageManagerServiceTests/TEST_MAPPING b/services/tests/PackageManagerServiceTests/TEST_MAPPING
new file mode 100644
index 0000000000000..af0008c29aafa
--- /dev/null
+++ b/services/tests/PackageManagerServiceTests/TEST_MAPPING
@@ -0,0 +1,18 @@
+{
+  "presubmit": [
+    {
+      "name": "AppEnumerationInternalTests"
+    }
+  ],
+  "postsubmit": [
+    {
+      "name": "PackageManagerServiceHostTests"
+    }
+  ],
+  "imports": [
+    {
+      "path": "frameworks/base/services/tests/PackageManagerServiceTests/unit"
+    }
+  ]
+}
+