diff --git a/.editorconfig b/.editorconfig
index d1e59e514..f849e1fa2 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,6 +7,15 @@ root = true
 indent_style = tab
 indent_size = 4
 tab_width = 4
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true
+
+# Don't change test output files
+[*.out]
+insert_final_newline = unset
+trim_trailing_whitespace = unset
 
 [*.sql]
 indent_style = space