diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..bf094abefc
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,13 @@
+root = true
+
+[*]
+insert_final_newline = false
+charset = utf-8
+indent_style = tab
+
+[tests/languages/**.test]
+end_of_line = crlf
+
+[{package.json,.travis.yml}]
+indent_style = space
+indent_size = 2
\ No newline at end of file