diff --git a/folly/experimental/fibers/test/main.cpp b/folly/experimental/fibers/test/main.cpp
index 083af7e..f983867 100644
--- a/folly/experimental/fibers/test/main.cpp
+++ b/folly/experimental/fibers/test/main.cpp
@@ -23,7 +23,7 @@ namespace google { using namespace gflags; }
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   auto rc = RUN_ALL_TESTS();
   folly::runBenchmarksOnFlag();
diff --git a/folly/experimental/test/StringKeyedTest.cpp b/folly/experimental/test/StringKeyedTest.cpp
index 782e6cd..e36f81b 100644
--- a/folly/experimental/test/StringKeyedTest.cpp
+++ b/folly/experimental/test/StringKeyedTest.cpp
@@ -503,7 +503,7 @@ int main(int argc, char **argv) {
   FLAGS_logtostderr = true;
   google::InitGoogleLogging(argv[0]);
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   return RUN_ALL_TESTS();
 }
diff --git a/folly/futures/test/main.cpp b/folly/futures/test/main.cpp
index 457278f..a596ae6 100644
--- a/folly/futures/test/main.cpp
+++ b/folly/futures/test/main.cpp
@@ -16,9 +16,10 @@
 
 #include <gtest/gtest.h>
 #include <gflags/gflags.h>
+#include <folly/Portability.h>
 
 int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
-  ::google::ParseCommandLineFlags(&argc, &argv, true);
+  ::gflags::ParseCommandLineFlags(&argc, &argv, true);
   return RUN_ALL_TESTS();
 }
diff --git a/folly/io/test/ShutdownSocketSetTest.cpp b/folly/io/test/ShutdownSocketSetTest.cpp
index 76a598f..bf19d72 100644
--- a/folly/io/test/ShutdownSocketSetTest.cpp
+++ b/folly/io/test/ShutdownSocketSetTest.cpp
@@ -226,6 +226,6 @@ TEST(ShutdownSocketSetTest, AbortiveKill) {
 
 int main(int argc, char *argv[]) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   return RUN_ALL_TESTS();
 }
diff --git a/folly/test/SingletonTest.cpp b/folly/test/SingletonTest.cpp
index 19baebb..f5d5983 100644
--- a/folly/test/SingletonTest.cpp
+++ b/folly/test/SingletonTest.cpp
@@ -531,7 +531,7 @@ BENCHMARK_RELATIVE(FollySingletonWeak, n) {
 int main(int argc, char* argv[]) {
   testing::InitGoogleTest(&argc, argv);
   google::InitGoogleLogging(argv[0]);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   SingletonVault::singleton()->registrationComplete();
 
diff --git a/folly/test/StringBenchmark.cpp b/folly/test/StringBenchmark.cpp
index 0241f8b..c9c90d7 100644
--- a/folly/test/StringBenchmark.cpp
+++ b/folly/test/StringBenchmark.cpp
@@ -48,7 +48,7 @@ BENCHMARK(folly_toLowerAscii, iters) {
 }
 
 int main(int argc, char** argv) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   folly::runBenchmarks();
   if (FLAGS_benchmark) {
     folly::runBenchmarks();
diff --git a/folly/wangle/service/ServiceTest.cpp b/folly/wangle/service/ServiceTest.cpp
index 9d58e09..297af72 100644
--- a/folly/wangle/service/ServiceTest.cpp
+++ b/folly/wangle/service/ServiceTest.cpp
@@ -205,7 +205,7 @@ TEST(Wangle, SuperComplexFilterTest) {
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
   google::InitGoogleLogging(argv[0]);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   return RUN_ALL_TESTS();
 }