diff --git a/cobalt/build/testing/targets/linux-x64x11/test_targets.json b/cobalt/build/testing/targets/linux-x64x11/test_targets.json
index 170692ff436f..7e1f1160c95c 100644
--- a/cobalt/build/testing/targets/linux-x64x11/test_targets.json
+++ b/cobalt/build/testing/targets/linux-x64x11/test_targets.json
@@ -27,7 +27,7 @@
     "services/service_manager/tests:service_manager_unittests",
     "skia:skia_unittests",
     "sql:sql_unittests",
-    "starboard:starboard_unittests",
+    "starboard:starboard_unittests_wrapper",
     "ui/ozone:ozone_unittests",
     "ui/wm:wm_unittests",
     "url:url_perftests",
@@ -62,7 +62,7 @@
     "out/linux-x64x11_devel/service_manager_unittests",
     "out/linux-x64x11_devel/skia_unittests",
     "out/linux-x64x11_devel/sql_unittests",
-    "out/linux-x64x11_devel/starboard_unittests",
+    "out/linux-x64x11_devel/starboard/starboard_unittests",
     "out/linux-x64x11_devel/wm_unittests",
     "out/linux-x64x11_devel/url_perftests",
     "out/linux-x64x11_devel/url_unittests",
diff --git a/starboard/BUILD.gn b/starboard/BUILD.gn
index 7370c1a1e0c7..716f242c3795 100644
--- a/starboard/BUILD.gn
+++ b/starboard/BUILD.gn
@@ -291,27 +291,25 @@ if (current_toolchain == starboard_toolchain) {
       public_deps += [ "//$starboard_path:starboard_platform_with_main" ]
     }
   }
-}
 
-# TODO(b/384819454): Move this guy to the block above and define here a
-#    group("starboard_unittests_wrapper") {
-#      testonly = true
-#      deps = [ ":starboard_unittests($starboard_toolchain)" ]
-#    }
-# then modify //cobalt/build/...test_targets.json to point to it instead of
-# starboard_unittests directly.
-test("starboard_unittests") {
-  deps = [ "//starboard/common:common_test" ]
-  if (sb_is_evergreen_compatible) {
-    deps += [
-      "//starboard/client_porting/eztime:eztime_test",
-      "//starboard/extension:extension_test",
-      "//starboard/loader_app:app_key_files_test",
-      "//starboard/loader_app:app_key_test",
-      "//starboard/loader_app:drain_file_test",
-    ]
-    if (current_toolchain == starboard_toolchain) {
+  test("starboard_unittests") {
+    deps = [ "//starboard/common:common_test" ]
+    if (!is_android) {
       deps += [ "//starboard/elf_loader:elf_loader_test" ]
     }
+    if (sb_is_evergreen_compatible) {
+      deps += [
+        "//starboard/client_porting/eztime:eztime_test",
+        "//starboard/extension:extension_test",
+        "//starboard/loader_app:app_key_files_test",
+        "//starboard/loader_app:app_key_test",
+        "//starboard/loader_app:drain_file_test",
+      ]
+    }
   }
 }
+
+group("starboard_unittests_wrapper") {
+  testonly = true
+  deps = [ ":starboard_unittests($starboard_toolchain)" ]
+}