diff --git a/media/TEST_MAPPING b/media/TEST_MAPPING
index 6f0e6234a9965..e8c7ad2cc0313 100644
--- a/media/TEST_MAPPING
+++ b/media/TEST_MAPPING
@@ -3,6 +3,9 @@
     {
       "name": "CtsMediaBetterTogetherTestCases"
     },
+    {
+      "name": "mediaroutertest"
+    },
     {
       "name": "CtsCameraTestCases",
       "options" : [
diff --git a/media/tests/MediaRouter/Android.bp b/media/tests/MediaRouter/Android.bp
index 2da6c9884c0f8..4f9c6f1ba68c6 100644
--- a/media/tests/MediaRouter/Android.bp
+++ b/media/tests/MediaRouter/Android.bp
@@ -25,7 +25,7 @@ android_test {
         "testng",
         "truth-prebuilt",
     ],
-
+    test_suites: ["general-tests"],
     platform_apis: true,
     certificate: "platform",
 }