diff --git a/starboard/BUILD.gn b/starboard/BUILD.gn
index 5502dd25ed75..d04864a66e85 100644
--- a/starboard/BUILD.gn
+++ b/starboard/BUILD.gn
@@ -28,7 +28,6 @@ group("gn_all") {
     "//starboard/examples/hello_world:starboard_hello_world_example",
     "//starboard/examples/window:starboard_window_example",
     "//starboard/extension:extension_test",
-    "//starboard/nplb",
   ]
   if (sb_is_evergreen_compatible && current_toolchain == starboard_toolchain) {
     deps += [ "//starboard/nplb/nplb_evergreen_compat_tests" ]
@@ -100,6 +99,7 @@ group("gn_all") {
 group("default") {
   deps = [
     ":starboard_group",
+    "//starboard/nplb",
     "//starboard/tools:build_app_launcher_zip",
   ]
 }
diff --git a/starboard/nplb/BUILD.gn b/starboard/nplb/BUILD.gn
index 68c21ad89b99..3d84f8c5b492 100644
--- a/starboard/nplb/BUILD.gn
+++ b/starboard/nplb/BUILD.gn
@@ -23,10 +23,10 @@ config("cast_codec_tests") {
 }
 
 target(gtest_target_type, "nplb") {
-  testonly = true
-
   sources = [
     "//starboard/common/test_main.cc",
+    "//starboard/common/thread.cc",
+    "//starboard/common/thread.h",
     "//starboard/nplb/sabi/alignment_test.cc",
     "//starboard/nplb/sabi/endianness_test.cc",
     "//starboard/nplb/sabi/signedness_and_size_of_enum_test.cc",
diff --git a/testing/gmock/BUILD.gn b/testing/gmock/BUILD.gn
index b1c28cc581f1..e4fc0b80010a 100644
--- a/testing/gmock/BUILD.gn
+++ b/testing/gmock/BUILD.gn
@@ -7,7 +7,6 @@
 # into //third_party/googletest.
 
 source_set("gmock") {
-  testonly = true
   sources = [
     "include/gmock/gmock-actions.h",
     "include/gmock/gmock-matchers.h",
@@ -20,6 +19,5 @@ source_set("gmock") {
 # it stabilizes, Chromium code MUST use this target instead of reaching directly
 # into //third_party/googletest.
 source_set("gmock_main") {
-  testonly = true
   deps = [ "//third_party/googletest:gmock_main" ]
 }
diff --git a/testing/gtest/BUILD.gn b/testing/gtest/BUILD.gn
index f8bb6c7358af..5860c01f2982 100644
--- a/testing/gtest/BUILD.gn
+++ b/testing/gtest/BUILD.gn
@@ -18,7 +18,7 @@ config("gtest_direct_config") {
 # it stabilizes, Chromium code MUST use this target instead of reaching directly
 # into //third_party/googletest.
 static_library("gtest") {
-  testonly = true
+
 
   sources = [
     "include/gtest/gtest-death-test.h",
diff --git a/third_party/googletest/BUILD.gn b/third_party/googletest/BUILD.gn
index f02100418698..fd8821acabc1 100644
--- a/third_party/googletest/BUILD.gn
+++ b/third_party/googletest/BUILD.gn
@@ -63,7 +63,6 @@ config("gmock_config") {
 # Do NOT depend on this directly. Use //testing/gtest instead.
 # See README.chromium for details.
 source_set("gtest") {
-  testonly = true
   sources = [
     # "custom/gtest/internal/custom/gtest.h",
     # "custom/gtest/internal/custom/stack_trace_getter.cc",
@@ -171,7 +170,6 @@ source_set("gtest_main") {
 # Do NOT depend on this directly. Use //testing/gmock instead.
 # See README.chromium for details.
 source_set("gmock") {
-  testonly = true
   sources = [
     "src/googlemock/include/gmock/gmock-actions.h",
     "src/googlemock/include/gmock/gmock-cardinalities.h",
@@ -205,7 +203,6 @@ source_set("gmock") {
 # Do NOT depend on this directly. Use //testing/gmock:gmock_main instead.
 # See README.chromium for details.
 static_library("gmock_main") {
-  testonly = true
   sources = [ "src/googlemock/src/gmock_main.cc" ]
   deps = [ ":gmock" ]
 }