diff --git a/.automation/test/README.md b/.automation/test/README.md
index 3b56fe42..53bccba2 100644
--- a/.automation/test/README.md
+++ b/.automation/test/README.md
@@ -1,7 +1,8 @@
 # Test Cases
 This folder holds `template test cases` that are used to validate the sanity of the **Super-Linter**.
 The format:
-- Folder(s) containing test cases for each language supported
+- Each **Super-Linter** language should have its own folder
+  - Folder(s) containing test cases for each language supported
   - Passing test case(s) per language denoted in naming scheme
   - Failing test case(s) per language denoted in naming scheme
 - Script to run test cases and validate the sanity of **Super-Linter**
diff --git a/.automation/test/docker/docker_bad_1.DOCKERFILE b/.automation/test/docker/bad/Dockerfile
similarity index 100%
rename from .automation/test/docker/docker_bad_1.DOCKERFILE
rename to .automation/test/docker/bad/Dockerfile
diff --git a/.automation/test/docker/docker_good_1.DOCKERFILE b/.automation/test/docker/good/Dockerfile
similarity index 100%
rename from .automation/test/docker/docker_good_1.DOCKERFILE
rename to .automation/test/docker/good/Dockerfile