diff --git a/starboard/elf_loader/BUILD.gn b/starboard/elf_loader/BUILD.gn
index a4a64205fe56..6afc8cd0a38d 100644
--- a/starboard/elf_loader/BUILD.gn
+++ b/starboard/elf_loader/BUILD.gn
@@ -92,8 +92,8 @@ if (sb_is_evergreen_compatible) {
   }
 }
 
-# TODO: b/309493306 - Stop building evergreen targets for all non-evergreen platforms.
-if (current_toolchain == starboard_toolchain && !is_host_win) {
+if (current_toolchain == starboard_toolchain &&
+    (sb_is_evergreen || sb_is_evergreen_compatible)) {
   target(starboard_level_final_executable_type, "elf_loader_sandbox") {
     data_deps = [ "//third_party/icu:icudata" ]
     if (cobalt_font_package == "empty") {
@@ -160,8 +160,7 @@ if (sb_is_evergreen_compatible) {
   }
 }
 
-# TODO: b/309493306 - Stop building evergreen targets for all non-evergreen platforms.
-if (!is_host_win) {
+if (sb_is_evergreen || sb_is_evergreen_compatible) {
   target(gtest_target_type, "elf_loader_test") {
     testonly = true
     sources = [ "//starboard/common/test_main.cc" ]
diff --git a/starboard/loader_app/BUILD.gn b/starboard/loader_app/BUILD.gn
index da5eaee6649e..12daaf17530c 100644
--- a/starboard/loader_app/BUILD.gn
+++ b/starboard/loader_app/BUILD.gn
@@ -237,8 +237,7 @@ static_library("installation_manager") {
   ]
 }
 
-# TODO: b/309493306 - Stop building evergreen targets for all non-evergreen platforms.
-if (!is_host_win) {
+if (sb_is_evergreen || sb_is_evergreen_compatible) {
   target(gtest_target_type, "installation_manager_test") {
     testonly = true
     sources = [
@@ -278,8 +277,7 @@ static_library("slot_management") {
   }
 }
 
-# TODO: b/309493306 - Stop building evergreen targets for all non-evergreen platforms.
-if (!is_host_win) {
+if (sb_is_evergreen || sb_is_evergreen_compatible) {
   target(gtest_target_type, "slot_management_test") {
     testonly = true
     sources = [
@@ -328,8 +326,7 @@ static_library("reset_evergreen_update") {
   deps = [ "//starboard:starboard_group" ]
 }
 
-# TODO: b/309493306 - Stop building evergreen targets for all non-evergreen platforms.
-if (!is_host_win) {
+if (sb_is_evergreen || sb_is_evergreen_compatible) {
   target(gtest_target_type, "reset_evergreen_update_test") {
     testonly = true
     sources = [