diff --git a/.editorconfig b/.editorconfig
index ca97ab47dfea49..2b0070686f4d5c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,6 +4,7 @@ root = true
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
+insert_final_newline = true
 
 [vcbuild.bat]
 end_of_line = crlf
@@ -37,3 +38,6 @@ indent_size = ignore
 end_of_line = ignore
 trim_trailing_whitespace = ignore
 charset = ignore
+
+[{test/fixtures,deps,tools/eslint,tools/gyp,tools/icu,tools/msvs}/**]
+insert_final_newline = false
diff --git a/benchmark/README.md b/benchmark/README.md
index 1012ac898fee65..5401d92a519d1d 100644
--- a/benchmark/README.md
+++ b/benchmark/README.md
@@ -352,4 +352,4 @@ Supported options keys are:
 [autocannon]: https://github.com/mcollina/autocannon
 [wrk]: https://github.com/wg/wrk
 [t-test]: https://en.wikipedia.org/wiki/Student%27s_t-test#Equal_or_unequal_sample_sizes.2C_unequal_variances
-[git-for-windows]: http://git-scm.com/download/win
\ No newline at end of file
+[git-for-windows]: http://git-scm.com/download/win