diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000000..c6c8b3621938a
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/test/layout_test.rb b/test/layout_test.rb
index 331380e1479cc..c4711c525e943 100644
--- a/test/layout_test.rb
+++ b/test/layout_test.rb
@@ -36,6 +36,7 @@
                     }
 
   TOPLEVEL_FILES = %w{
+                      .editorconfig
                       .gitignore
                       .rspec
                       .rubocop.yml