diff --git a/.github/config/android-arm.json b/.github/config/android-arm.json
index b8b6850e2c0..6296f1d5991 100644
--- a/.github/config/android-arm.json
+++ b/.github/config/android-arm.json
@@ -13,7 +13,8 @@
         "gpu_unittests",
         "gin_unittests",
         "blink_unittests",
-        "content_shell",
+        "media_unittests",
+        "content_shell_apk",
         "system_webview_apk",
         "system_webview_shell_apk",
         "cobalt:gn_all"
diff --git a/.github/config/android-arm64.json b/.github/config/android-arm64.json
index 8f5d8b87de4..14cf3ea7aba 100644
--- a/.github/config/android-arm64.json
+++ b/.github/config/android-arm64.json
@@ -13,7 +13,8 @@
         "gpu_unittests",
         "gin_unittests",
         "blink_unittests",
-        "content_shell",
+        "media_unittests",
+        "content_shell_apk",
         "system_webview_apk",
         "system_webview_shell_apk",
         "cobalt:gn_all"
diff --git a/.github/config/android-x86.json b/.github/config/android-x86.json
index b466f5549f4..8a42062e999 100644
--- a/.github/config/android-x86.json
+++ b/.github/config/android-x86.json
@@ -13,7 +13,8 @@
         "gpu_unittests",
         "gin_unittests",
         "blink_unittests",
-        "content_shell",
+        "media_unittests",
+        "content_shell_apk",
         "system_webview_apk",
         "system_webview_shell_apk",
         "cobalt:gn_all"
diff --git a/.github/config/chromium_android-arm.json b/.github/config/chromium_android-arm.json
index 12b586a28ad..108d0609bae 100644
--- a/.github/config/chromium_android-arm.json
+++ b/.github/config/chromium_android-arm.json
@@ -13,7 +13,8 @@
         "gpu_unittests",
         "gin_unittests",
         "blink_unittests",
-        "content_shell",
+        "media_unittests",
+        "content_shell_apk",
         "system_webview_apk",
         "system_webview_shell_apk"
     ],
diff --git a/.github/config/chromium_android-arm64.json b/.github/config/chromium_android-arm64.json
index 7f14382226f..112fe51458d 100644
--- a/.github/config/chromium_android-arm64.json
+++ b/.github/config/chromium_android-arm64.json
@@ -13,7 +13,8 @@
         "gpu_unittests",
         "gin_unittests",
         "blink_unittests",
-        "content_shell",
+        "media_unittests",
+        "content_shell_apk",
         "system_webview_apk",
         "system_webview_shell_apk"
     ],
diff --git a/.github/config/chromium_android-x86.json b/.github/config/chromium_android-x86.json
index 29813696174..fb93cb95c67 100644
--- a/.github/config/chromium_android-x86.json
+++ b/.github/config/chromium_android-x86.json
@@ -13,7 +13,8 @@
         "gpu_unittests",
         "gin_unittests",
         "blink_unittests",
-        "content_shell",
+        "media_unittests",
+        "content_shell_apk",
         "system_webview_apk",
         "system_webview_shell_apk"
     ],
diff --git a/.github/config/chromium_linux.json b/.github/config/chromium_linux.json
index f83ef4e6364..01114cd966a 100644
--- a/.github/config/chromium_linux.json
+++ b/.github/config/chromium_linux.json
@@ -13,6 +13,7 @@
         "gpu_unittests",
         "gin_unittests",
         "blink_unittests",
+        "media_unittests",
         "content_shell"
     ],
     "includes": [
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 0f5ea42427f..54dcb459ef1 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -203,7 +203,10 @@ test("media_unittests") {
   ]
 
   if (is_cobalt) {
-    deps += ["//media/starboard:unit_tests"]
+    # TODO(b/379934658): add starboard_renderer_test.
+    # TODO(b/379936173): enable starboard_utils_test.
+    # TODO(b/379934533): enable bidirectional_fit_reuse_allocator_test.
+    # deps += ["//media/starboard:unit_tests"]
   }
 
   data = [
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index 487af904af7..5f6b383e0e7 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -140,6 +140,9 @@ class MockPipeline : public Pipeline {
   }
   MOCK_METHOD2(OnSetCdm,
                void(CdmContext* cdm_context, CdmAttachedCB& cdm_attached_cb));
+#if BUILDFLAG(USE_STARBOARD_MEDIA)
+  MOCK_METHOD0(GetSetBoundsCB, SetBoundsCB());
+#endif // BUILDFLAG(USE_STARBOARD_MEDIA)
 };
 
 class MockMediaResource : public MediaResource {
diff --git a/media/media_options.gni b/media/media_options.gni
index b4401c58d95..694f26f5e7f 100644
--- a/media/media_options.gni
+++ b/media/media_options.gni
@@ -57,11 +57,6 @@ declare_args() {
     media_use_libvpx = false
   }
 
-  # Chrobalt doesn't use ffmpeg.
-  if (is_cobalt) {
-    media_use_ffmpeg = false
-  }
-
   # Enable usage of OpenH264 within the media library. Used for software based
   # encoding of H264 content.
   media_use_openh264 = true