diff --git a/.automation/test/shfmt/.editorconfig b/.automation/test/shell_shfmt/.editorconfig
similarity index 51%
rename from .automation/test/shfmt/.editorconfig
rename to .automation/test/shell_shfmt/.editorconfig
index f41c803b..8c250236 100644
--- a/.automation/test/shfmt/.editorconfig
+++ b/.automation/test/shell_shfmt/.editorconfig
@@ -1,3 +1,6 @@
+# top-most EditorConfig file
+root = true
+
 [*.ext]
 indent_style = space
 indent_size = 4
diff --git a/.automation/test/shfmt/README.md b/.automation/test/shell_shfmt/README.md
similarity index 100%
rename from .automation/test/shfmt/README.md
rename to .automation/test/shell_shfmt/README.md
diff --git a/.automation/test/shfmt/shell_bad_1.sh b/.automation/test/shell_shfmt/shell_shfmt_bad_1.sh
similarity index 100%
rename from .automation/test/shfmt/shell_bad_1.sh
rename to .automation/test/shell_shfmt/shell_shfmt_bad_1.sh
diff --git a/.automation/test/shfmt/shell_good_1.sh b/.automation/test/shell_shfmt/shell_shfmt_good_1.sh
similarity index 100%
rename from .automation/test/shfmt/shell_good_1.sh
rename to .automation/test/shell_shfmt/shell_shfmt_good_1.sh
diff --git a/lib/worker.sh b/lib/worker.sh
index e8d8ae44..d381c7d1 100755
--- a/lib/worker.sh
+++ b/lib/worker.sh
@@ -679,7 +679,7 @@ function RunTestCases() {
   TestCodebase "R" "lintr" "lintr::lint()" ".*\.\(r\|rmd\)\$" "r"
   TestCodebase "RAKU" "raku" "raku -c" ".*\.\(raku\|rakumod\|rakutest\|pm6\|pl6\|p6\)\$" "raku"
   TestCodebase "RUBY" "rubocop" "rubocop -c ${RUBY_LINTER_RULES}" ".*\.\(rb\)\$" "ruby"
-  TestCodebase "SHFMT" "shfmt" "shfmt -d" ".*\.\(sh\|bash\|dash\|ksh\)\$" "shell"
+  TestCodebase "SHELL_SHFMT" "shfmt" "shfmt -d" ".*\.\(sh\|bash\|dash\|ksh\)\$" "shell_shfmt"
   TestCodebase "STATES" "asl-validator" "asl-validator --json-path" ".*\.\(json\)\$" "states"
   TestCodebase "SQL" "sql-lint" "sql-lint --config ${SQL_LINTER_RULES}" ".*\.\(sql\)\$" "sql"
   TestCodebase "TERRAFORM" "tflint" "tflint -c ${TERRAFORM_LINTER_RULES}" ".*\.\(tf\)\$" "terraform"