diff --git a/tools/mts-tradefed/res/config/mts-exclude.xml b/tools/mts-tradefed/res/config/mts-exclude.xml
index 75ecacf..5a40844 100644
--- a/tools/mts-tradefed/res/config/mts-exclude.xml
+++ b/tools/mts-tradefed/res/config/mts-exclude.xml
@@ -54,16 +54,7 @@
     <!-- b/38280830 -->
     <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.VideoDecoderPerfTest#testVp8Goog0Perf1280x0720" />
 
-    <!-- Flacky tests in CtsMediaTestCases that are not related to media mainlines -->
-    <!-- b/143246724 -->
-    <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.AudioFocusTest.testAudioFocusRequestBuilderDefault" />
-    <!-- b/143245713 -->
-    <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.AudioRecordingConfigurationTest.testParcel" />
-    <!-- b/143245870 -->
-    <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.AudioPlaybackCaptureTest.testPlaybackCaptureDoS" />
-    <!-- b/142977679 -->
-    <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.MediaSyncTest.testAudioBufferReturn" />
-    <!-- b/142964090 -->
-    <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.BassBoostTest.test3_2ParameterChangedListener" />
+    <!-- Exclude tests that are not related to media mainlines -->
+    <option name="compatibility:module-arg" value="CtsMediaTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
 </configuration>
 
diff --git a/tools/mts-tradefed/res/config/mts-media.xml b/tools/mts-tradefed/res/config/mts-media.xml
index 7eb1e99..173cd4f 100644
--- a/tools/mts-tradefed/res/config/mts-media.xml
+++ b/tools/mts-tradefed/res/config/mts-media.xml
@@ -34,15 +34,6 @@
     <!-- b/38280830 -->
     <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.VideoDecoderPerfTest#testVp8Goog0Perf1280x0720" />
 
-    <!-- Flacky tests in CtsMediaTestCases that are not related to media mainlines -->
-    <!-- b/143246724 -->
-    <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.AudioFocusTest.testAudioFocusRequestBuilderDefault" />
-    <!-- b/143245713 -->
-    <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.AudioRecordingConfigurationTest.testParcel" />
-    <!-- b/143245870 -->
-    <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.AudioPlaybackCaptureTest.testPlaybackCaptureDoS" />
-    <!-- b/142977679 -->
-    <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.MediaSyncTest.testAudioBufferReturn" />
-    <!-- b/142964090 -->
-    <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.BassBoostTest.test3_2ParameterChangedListener" />
+    <!-- Exclude tests that are not related to media mainlines -->
+    <option name="compatibility:module-arg" value="CtsMediaTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
 </configuration>