diff --git a/testapps/controller/src/main/java/androidx/media3/testapp/controller/MediaIntToString.kt b/testapps/controller/src/main/java/androidx/media3/testapp/controller/MediaIntToString.kt
index 7e7fd64b4f..772dfe431a 100644
--- a/testapps/controller/src/main/java/androidx/media3/testapp/controller/MediaIntToString.kt
+++ b/testapps/controller/src/main/java/androidx/media3/testapp/controller/MediaIntToString.kt
@@ -67,7 +67,6 @@ object MediaIntToString {
     )
   val sessionCommandMap =
     mapOf(
-      SessionCommand.COMMAND_CODE_CUSTOM to "COMMAND_CUSTOM",
       SessionCommand.COMMAND_CODE_SESSION_SET_RATING to "COMMAND_SESSION_SET_RATING",
       SessionCommand.COMMAND_CODE_LIBRARY_GET_LIBRARY_ROOT to "COMMAND_LIBRARY_GET_LIBRARY_ROOT",
       SessionCommand.COMMAND_CODE_LIBRARY_SUBSCRIBE to "COMMAND_LIBRARY_SUBSCRIBE",
diff --git a/testapps/controller/src/test/java/androidx/media3/testapp/controller/MediaIntToStringTest.kt b/testapps/controller/src/test/java/androidx/media3/testapp/controller/MediaIntToStringTest.kt
index a7f19d6506..db8d76c0e6 100644
--- a/testapps/controller/src/test/java/androidx/media3/testapp/controller/MediaIntToStringTest.kt
+++ b/testapps/controller/src/test/java/androidx/media3/testapp/controller/MediaIntToStringTest.kt
@@ -42,9 +42,9 @@ class MediaIntToStringTest {
   @Test
   fun getSessionCommandMap() {
     val expectedSessionCommandMap =
-      getValuesToFieldNameMap(SessionCommand::class.java, "COMMAND_").mapValues { (_, value) ->
-        value.replace("COMMAND_CODE_", "COMMAND_")
-      }
+      getValuesToFieldNameMap(SessionCommand::class.java, "COMMAND_")
+        .mapValues { (_, value) -> value.replace("COMMAND_CODE_", "COMMAND_") }
+        .filterValues { it != "COMMAND_CUSTOM" }
 
     assertThat(MediaIntToString.sessionCommandMap).isEqualTo(expectedSessionCommandMap)
   }