diff --git a/core/java/android/service/quicksettings/TEST_MAPPING b/core/java/android/service/quicksettings/TEST_MAPPING
new file mode 100644
index 0000000000000..2d45c5b252ccc
--- /dev/null
+++ b/core/java/android/service/quicksettings/TEST_MAPPING
@@ -0,0 +1,15 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsTileServiceTestCases",
+      "options": [
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/qs/TEST_MAPPING b/packages/SystemUI/src/com/android/systemui/qs/TEST_MAPPING
index 55da2038754d9..2d45c5b252ccc 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/TEST_MAPPING
+++ b/packages/SystemUI/src/com/android/systemui/qs/TEST_MAPPING
@@ -1,14 +1,8 @@
 {
   "presubmit": [
     {
-      "name": "CtsAppTestCases",
+      "name": "CtsTileServiceTestCases",
       "options": [
-        {
-          "include-filter": "android.app.cts.TileServiceTest"
-        },
-        {
-          "include-filter": "android.app.cts.BooleanTileServiceTest"
-        },
         {
           "exclude-annotation": "org.junit.Ignore"
         },
diff --git a/services/core/java/com/android/server/statusbar/TEST_MAPPING b/services/core/java/com/android/server/statusbar/TEST_MAPPING
new file mode 100644
index 0000000000000..67ea557d7806d
--- /dev/null
+++ b/services/core/java/com/android/server/statusbar/TEST_MAPPING
@@ -0,0 +1,29 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsTileServiceTestCases",
+      "options": [
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    },
+    {
+      "name": "CtsAppTestCases",
+      "options": [
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "include-filter": "android.app.cts.RequestTileServiceAddTest"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file