diff --git a/BUILD.gn b/BUILD.gn
index f32c594..ea17d82 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -13,6 +13,8 @@
 
 config("gtest_config") {
   include_dirs = [ "googletest/include" ]
+  # Suppress warnings from upstream code that happen in Fuchsia build
+  cflags = [ "-Wno-conversion" ]
 }
 
 static_library("gtest") {
@@ -76,9 +78,6 @@
       ]
     }
   }
-
-  # TODO(fxb/58162): delete the below and fix compiler warnings
-  configs += [ "//build/config:Wno-conversion" ]
 }
 
 # Library that defines the FRIEND_TEST macro.
@@ -219,6 +218,9 @@
     # fixed.
     "-Wno-inconsistent-missing-override",
   ]
+  
+  # Suppress warnings from upstream code that happen in Fuchsia build
+  cflags = [ "-Wno-conversion" ]
 }
 
 static_library("gmock") {
@@ -252,9 +254,6 @@
   public_configs = [ ":gmock_config" ]
   configs += [ ":gmock_private_config" ]
   deps = [ ":gtest" ]
-
-  # TODO(fxb/58162): delete the below and fix compiler warnings
-  configs += [ "//build/config:Wno-conversion" ]
 }
 
 static_library("gmock_main") {