diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING
index 28e73a9624ab7..ab868604dfdef 100644
--- a/core/java/android/app/TEST_MAPPING
+++ b/core/java/android/app/TEST_MAPPING
@@ -18,15 +18,6 @@
             "file_patterns": ["(/|^)AppOpsManager.java"],
             "name": "CtsAppOpsTestCases"
         },
-        {
-            "file_patterns": ["(/|^)AppOpsManager.java"],
-            "name": "CtsStatsdHostTestCases",
-            "options": [
-                {
-                    "include-filter": "android.cts.statsd.atom.UidAtomTests"
-                }
-            ]
-        },
         {
             "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 e242527310864..a3baa7e8bdeae 100644
--- a/services/core/java/com/android/server/appop/TEST_MAPPING
+++ b/services/core/java/com/android/server/appop/TEST_MAPPING
@@ -43,14 +43,6 @@
                     "include-filter": "android.app.cts.ActivityManagerApi29Test"
                 }
             ]
-        },
-        {
-            "name": "CtsStatsdHostTestCases",
-            "options": [
-                {
-                    "include-filter": "android.cts.statsd.atom.UidAtomTests"
-                }
-            ]
         }
     ]
 }