diff --git a/Gulpfile.js b/Gulpfile.js
index 41f193261e990..7bd32515ba5fe 100644
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -350,10 +350,12 @@ const lintFoldEnd = async () => { if (fold.isTravis()) console.log(fold.end("lin
 /** @type { (folder: string) => { (): Promise<any>; displayName?: string } } */
 const eslint = (folder) => async () => {
 
+    const formatter = cmdLineOptions.ci ? "stylish" : "autolinkable-stylish";
     const args = [
         "node_modules/eslint/bin/eslint",
         "--cache",
         "--cache-location", `${folder}/.eslintcache`,
+        "--format", formatter,
         "--rulesdir", "scripts/eslint/built/rules",
         "--ext", ".ts",
     ];
@@ -362,14 +364,6 @@ const eslint = (folder) => async () => {
         args.push("--fix");
     }
 
-    // Use stylish format on CI, so that it can be picked up by GH Action's rule matchers
-    if (cmdLineOptions.ci) {
-        args.push("--format", "stylish");
-    }
-    else {
-        args.push("--format", "autolinkable-stylish");
-    }
-
     args.push(folder);
 
     log(`Linting: ${args.join(" ")}`);
diff --git a/package.json b/package.json
index 6947d7ec11f92..7f9e66add40e7 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
         "@types/through2": "latest",
         "@types/travis-fold": "latest",
         "@types/xml2js": "^0.4.0",
-        "@typescript-eslint/eslint-plugin": "^3.4.1-alpha.1",
+        "@typescript-eslint/eslint-plugin": "^3.6.1-alpha.1",
         "@typescript-eslint/experimental-utils": "^3.4.1-alpha.1",
         "@typescript-eslint/parser": "^3.4.1-alpha.1",
         "async": "latest",