diff --git a/Makefile b/Makefile
index 3af1841eb6..094ef28876 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,9 @@ bootstrap-flow: clean
 test-flow:
 	node scripts/run_flow_tests.js
 
+test-flow-update-whitelist:
+	node scripts/run_flow_tests.js --update-whitelist
+
 bootstrap-test262: clean
 	mkdir ./build
 	git clone https://github.com/tc39/test262.git ./build/test262
diff --git a/scripts/run_flow_tests.js b/scripts/run_flow_tests.js
index a8ba4f2def..e08ecc3556 100644
--- a/scripts/run_flow_tests.js
+++ b/scripts/run_flow_tests.js
@@ -8,6 +8,8 @@ const parse = require("..").parse;
 const TESTS_FOLDER = path.join(__dirname, "../build/flow/src/parser/test/flow");
 const WHITELIST_PATH = path.join(__dirname, "./flow_tests_whitelist.txt");
 
+const shouldUpdateWhitelist = process.argv.indexOf("--update-whitelist") > 0;
+
 function map_get_default(map, key, defaultConstructor) {
   if (map.has(key)) {
     return map.get(key);
@@ -74,6 +76,25 @@ function get_tests(root_dir) {
   return tests;
 }
 
+function update_whitelist(summary) {
+  const contains = (tests, file) =>
+    tests.some(({ test }) => test.file === file);
+
+  const result = fs
+    .readFileSync(WHITELIST_PATH, "utf8")
+    .split("\n")
+    .filter(line => {
+      const file = line.replace(/#.*$/, "").trim();
+      return (
+        !contains(summary.disallowed.success, file) &&
+        !contains(summary.disallowed.failure, file) &&
+        summary.unrecognized.indexOf(file) === -1
+      );
+    })
+    .join("\n");
+  fs.writeFileSync(WHITELIST_PATH, result);
+}
+
 const options = {
   plugins: ["jsx", "flow", "asyncGenerators", "objectRestSpread"],
   sourceType: "module",
@@ -164,48 +185,50 @@ summary.passed &= summary.unrecognized.length === 0;
 // `process.stdout.write(".")` there is no final newline
 console.log();
 
-console.log("\n-- FAILED TESTS --");
-summary.disallowed.failure.forEach(
-  ({ test, shouldSuccess, exception, babylonOptions }) => {
-    console.log(chalk.red(`✘ ${test.file}`));
-    if (shouldSuccess) {
-      console.log(chalk.yellow("  Should parse successfully, but did not"));
-      console.log(chalk.yellow(`  Failed with: \`${exception.message}\``));
-    } else {
-      console.log(chalk.yellow("  Should fail parsing, but did not"));
-    }
-    console.log(
-      chalk.yellow(
-        `  Active plugins: ${JSON.stringify(babylonOptions.plugins)}`
-      )
-    );
-  }
-);
-summary.disallowed.success.forEach(
-  ({ test, shouldSuccess, babylonOptions }) => {
-    console.log(chalk.red(`✘ ${test.file}`));
-    if (shouldSuccess) {
+if (summary.disallowed.failure.length || summary.disallowed.success.length) {
+  console.log("\n-- FAILED TESTS --");
+  summary.disallowed.failure.forEach(
+    ({ test, shouldSuccess, exception, babylonOptions }) => {
+      console.log(chalk.red(`✘ ${test.file}`));
+      if (shouldSuccess) {
+        console.log(chalk.yellow("  Should parse successfully, but did not"));
+        console.log(chalk.yellow(`  Failed with: \`${exception.message}\``));
+      } else {
+        console.log(chalk.yellow("  Should fail parsing, but did not"));
+      }
       console.log(
         chalk.yellow(
-          "  Correctly parsed successfully, but" +
-            " was disallowed by the whitelist"
-        )
-      );
-    } else {
-      console.log(
-        chalk.yellow(
-          "  Correctly failed parsing, but" +
-            " was disallowed by the whitelist"
+          `  Active plugins: ${JSON.stringify(babylonOptions.plugins)}`
         )
       );
     }
-    console.log(
-      chalk.yellow(
-        `  Active plugins: ${JSON.stringify(babylonOptions.plugins)}`
-      )
-    );
-  }
-);
+  );
+  summary.disallowed.success.forEach(
+    ({ test, shouldSuccess, babylonOptions }) => {
+      console.log(chalk.red(`✘ ${test.file}`));
+      if (shouldSuccess) {
+        console.log(
+          chalk.yellow(
+            "  Correctly parsed successfully, but" +
+              " was disallowed by the whitelist"
+          )
+        );
+      } else {
+        console.log(
+          chalk.yellow(
+            "  Correctly failed parsing, but" +
+              " was disallowed by the whitelist"
+          )
+        );
+      }
+      console.log(
+        chalk.yellow(
+          `  Active plugins: ${JSON.stringify(babylonOptions.plugins)}`
+        )
+      );
+    }
+  );
+}
 
 console.log("-- SUMMARY --");
 console.log(
@@ -236,4 +259,14 @@ console.log(
   )
 );
 
-process.exit(summary.passed ? 0 : 1);
+// Some padding to separate the output from the message `make`
+// adds at the end of failing scripts
+console.log();
+
+
+if (shouldUpdateWhitelist) {
+  update_whitelist(summary);
+  console.log("\nWhitelist updated");
+} else {
+  process.exit(summary.passed ? 0 : 1);
+}