diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING
index ab868604dfdef..344a4d79b766d 100644
--- a/core/java/android/app/TEST_MAPPING
+++ b/core/java/android/app/TEST_MAPPING
@@ -18,6 +18,10 @@
             "file_patterns": ["(/|^)AppOpsManager.java"],
             "name": "CtsAppOpsTestCases"
         },
+        {
+            "file_patterns": ["(/|^)AppOpsManager.java"],
+            "name": "UidAtomTests:testAppOps"
+        },
         {
             "file_patterns": ["(/|^)AppOpsManager.java"],
             "name": "FrameworksServicesTests",
diff --git a/services/core/java/com/android/server/appop/TEST_MAPPING b/services/core/java/com/android/server/appop/TEST_MAPPING
index 9c03a3606e6c0..604b9f1ead6d0 100644
--- a/services/core/java/com/android/server/appop/TEST_MAPPING
+++ b/services/core/java/com/android/server/appop/TEST_MAPPING
@@ -38,6 +38,9 @@
         },
         {
             "name": "CtsAppTestCases:ActivityManagerApi29Test"
+        },
+        {
+            "name": "UidAtomTests:testAppOps"
         }
     ]
 }