diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn
index 3de1dca..7bb11a1 100644
--- a/webrtc/test/BUILD.gn
+++ b/webrtc/test/BUILD.gn
@@ -28,6 +28,9 @@
     "../system_wrappers",
   ]
 
+  configs += [ "..:common_config" ]
+  public_configs = [ "..:common_inherited_config"]
+
   if (is_clang) {
     # Suppress warnings from Chrome's Clang plugins.
     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
@@ -70,6 +73,9 @@
     sources += [ "testsupport/android/root_path_android.cc" ]
   }
 
+  configs += [ "..:common_config" ]
+  public_configs = [ "..:common_inherited_config"]
+
   if (is_clang) {
     # Suppress warnings from Chrome's Clang plugins.
     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
@@ -94,6 +100,9 @@
     "//third_party/gflags",
   ]
 
+  configs += [ "..:common_config" ]
+  public_configs = [ "..:common_inherited_config"]
+
   if (is_clang) {
     # Suppress warnings from Chrome's Clang plugins.
     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
diff --git a/webrtc/tools/BUILD.gn b/webrtc/tools/BUILD.gn
index f66d8d5..882a16e 100644
--- a/webrtc/tools/BUILD.gn
+++ b/webrtc/tools/BUILD.gn
@@ -19,6 +19,9 @@
     "simple_command_line_parser.h",
     "simple_command_line_parser.cc",
   ]
+
+  configs += [ "..:common_config" ]
+  public_configs = [ "..:common_inherited_config"]
 }
 
 # TODO(kjellander): Convert all of tools.gyp into GN here.
@@ -31,6 +34,9 @@
       "simple_command_line_parser_unittest.cc",
     ]
 
+    configs += [ "..:common_config" ]
+    public_configs = [ "..:common_inherited_config"]
+
     deps = [
       ":command_line_parser",
       "../test:test_support_main",