diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000000..3c44241cc4f
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/package.json b/package.json
index 3242cc0b2e0..90b7068532e 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,9 @@
   "scripts": {
     "test-puppeteer": "jasmine test/test.js",
     "test-phantom": "python third_party/phantomjs/test/run-tests.py",
-    "test": "npm run test-puppeteer && npm run test-phantom",
-    "install": "node install.js"
+    "test": "yarn lint --silent && npm run test-puppeteer && npm run test-phantom",
+    "install": "node install.js",
+    "lint": "eslint --quiet -f codeframe . || eslint ."
   },
   "author": "The Chromium Authors",
   "license": "SEE LICENSE IN LICENSE",
diff --git a/test/test.js b/test/test.js
index c613bac3869..9dd0582ab09 100644
--- a/test/test.js
+++ b/test/test.js
@@ -275,9 +275,9 @@ var customMatchers = {
             compare: function(actual, expected) {
                 return compareImageToGolden(actual, expected);
             }
-        }
+        };
     }
-}
+};
 
 /**
  * @param {?Buffer} imageBuffer