diff --git a/jni/Android.bp b/jni/Android.bp
index dfb2da3..866c75e 100644
--- a/jni/Android.bp
+++ b/jni/Android.bp
@@ -73,7 +73,7 @@
 
 cc_test {
     name: "fuse_node_test",
-    test_suites: ["device-tests", "mts"],
+    test_suites: ["device-tests", "mts-mediaprovider"],
     test_config: "fuse_node_test.xml",
 
     compile_multilib: "both",
@@ -107,7 +107,7 @@
 
 cc_test {
     name: "RedactionInfoTest",
-    test_suites: ["device-tests", "mts"],
+    test_suites: ["device-tests", "mts-mediaprovider"],
     test_config: "RedactionInfoTest.xml",
 
     compile_multilib: "both",
@@ -139,7 +139,7 @@
 
 cc_test {
     name: "FuseUtilsTest",
-    test_suites: ["device-tests", "mts"],
+    test_suites: ["device-tests", "mts-mediaprovider"],
     test_config: "FuseUtilsTest.xml",
 
     compile_multilib: "both",
diff --git a/tests/Android.bp b/tests/Android.bp
index 8054a05..25dd84a 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -7,7 +7,7 @@
     name: "MediaProviderTests",
     test_suites: [
         "device-tests",
-        "mts",
+        "mts-mediaprovider",
     ],
     compile_multilib: "both",
 
diff --git a/tests/client/Android.bp b/tests/client/Android.bp
index 2b35634..a5b5beb 100644
--- a/tests/client/Android.bp
+++ b/tests/client/Android.bp
@@ -2,7 +2,7 @@
     name: "MediaProviderClientTests",
     test_suites: [
         "device-tests",
-        "mts",
+        "mts-mediaprovider",
     ],
     compile_multilib: "both",
 
diff --git a/tests/transcode/Android.bp b/tests/transcode/Android.bp
index 3619c69..80655cc 100644
--- a/tests/transcode/Android.bp
+++ b/tests/transcode/Android.bp
@@ -2,7 +2,7 @@
     name: "MediaProviderTranscodeTests",
     test_suites: [
         "device-tests",
-        "mts",
+        "mts-mediaprovider",
     ],
     compile_multilib: "both",
 
@@ -54,4 +54,4 @@
     ],
     static_libs: ["androidx.legacy_legacy-support-v4"],
     target_sdk_version: "28",
-}
\ No newline at end of file
+}