diff --git a/folly/test/RandomTest.cpp b/folly/test/RandomTest.cpp
index 09aff3c8cd31bac3898c56a7eee4d3abd8248cfc..dee976989a870ee6b043a7c5e91fc78f71c11c45 100644
--- a/folly/test/RandomTest.cpp
+++ b/folly/test/RandomTest.cpp
@@ -99,9 +99,11 @@ BENCHMARK(Random64Num) { doNotOptimizeAway(Random::rand64(100ul << 32)); }
 BENCHMARK(Random64OneIn) { doNotOptimizeAway(Random::oneIn(100)); }
 
 int main(int argc, char** argv) {
+  testing::InitGoogleTest(&argc, argv);
   google::ParseCommandLineFlags(&argc, &argv, true);
 
-  runBenchmarks();
-
-  return 0;
+  if (FLAGS_benchmark) {
+    folly::runBenchmarks();
+  }
+  return RUN_ALL_TESTS();
 }