diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..7a7ad4c70e
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[src/test*/java/**.java]
+indent_size = 4
+ij_continuation_indent_size = 2
diff --git a/src/test/java/.editorconfig b/src/test/java/.editorconfig
deleted file mode 100644
index a4824935e4..0000000000
--- a/src/test/java/.editorconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-root = true
-
-[*.java]
-indent_size = 4
-ij_continuation_indent_size = 2