diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING
index 8ad33dbf9f4a9..b65ae7a0a7b94 100644
--- a/core/java/android/app/TEST_MAPPING
+++ b/core/java/android/app/TEST_MAPPING
@@ -27,6 +27,15 @@
                 }
             ]
         },
+        {
+            "file_patterns": ["(/|^)AppOpsManager.java"],
+            "name": "CtsStatsdHostTestCases",
+            "options": [
+                {
+                    "include-filter": "android.cts.statsd.atom.UidAtomTests#testAppOps"
+                }
+            ]
+        },
         {
             "file_patterns": ["(/|^)AppOpsManager.java"],
             "name": "CtsPermission2TestCases",
diff --git a/services/core/java/com/android/server/appop/TEST_MAPPING b/services/core/java/com/android/server/appop/TEST_MAPPING
index a3baa7e8bdeae..00bbacc089a2d 100644
--- a/services/core/java/com/android/server/appop/TEST_MAPPING
+++ b/services/core/java/com/android/server/appop/TEST_MAPPING
@@ -43,6 +43,14 @@
                     "include-filter": "android.app.cts.ActivityManagerApi29Test"
                 }
             ]
-        }
+        },
+        {
+            "name": "CtsStatsdHostTestCases",
+            "options": [
+                {
+                    "include-filter": "android.cts.statsd.atom.UidAtomTests#testAppOps"
+                }
+            ]
+        }        
     ]
 }