diff --git a/.editorconfig b/.editorconfig
index a1df58daf869c8..1c1b4418547481 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
@@ -34,3 +35,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