diff --git a/.editorconfig b/.editorconfig
index 79b58f6..7410945 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,13 +2,13 @@ root = true
 
 [*]
 indent_size = 4
-indent_style = spaces
+indent_style = space
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.go]
+[**.go]
 indent_style = tab
 
 [file-extensions.txt]
diff --git a/editorconfig/tests/.editorconfig b/editorconfig/tests/.editorconfig
index 36c6853..7c753d2 100644
--- a/editorconfig/tests/.editorconfig
+++ b/editorconfig/tests/.editorconfig
@@ -2,7 +2,7 @@ root = true
 
 [*]
 indent_size = 4
-indent_style = spaces
+indent_style = space
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
diff --git a/editorconfig/tests/a/b/has-root-config/.editorconfig b/editorconfig/tests/a/b/has-root-config/.editorconfig
index 619fe34..c20de85 100644
--- a/editorconfig/tests/a/b/has-root-config/.editorconfig
+++ b/editorconfig/tests/a/b/has-root-config/.editorconfig
@@ -1,4 +1,4 @@
 root = true
 
 [*]
-indent_style = spaces
+indent_style = space