diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefiles.yml
similarity index 95%
rename from .github/workflows/makefile.yml
rename to .github/workflows/makefiles.yml
index 97fc949f14..f293e62f08 100644
--- a/.github/workflows/makefile.yml
+++ b/.github/workflows/makefiles.yml
@@ -27,5 +27,5 @@ jobs:
     - name: Install prerequisites
       run: scripts/install-prerequisites.sh
     - name: Build
-      working-directory: tests/makefile
+      working-directory: tests/makefiles
       run: make test_file
diff --git a/.github/workflows/makefile_uefi.yml b/.github/workflows/makefiles_uefi.yml
similarity index 95%
rename from .github/workflows/makefile_uefi.yml
rename to .github/workflows/makefiles_uefi.yml
index f6cccb4cc1..e0c3fdcf5c 100644
--- a/.github/workflows/makefile_uefi.yml
+++ b/.github/workflows/makefiles_uefi.yml
@@ -29,5 +29,5 @@ jobs:
     - name: Install clang
       run: sudo apt-get install clang lld
     - name: Build
-      working-directory: tests/makefile_uefi
+      working-directory: tests/makefiles_uefi
       run: make -j
diff --git a/tests/makefile/.gitignore b/tests/makefiles/.gitignore
similarity index 100%
rename from tests/makefile/.gitignore
rename to tests/makefiles/.gitignore
diff --git a/tests/makefile/Makefile b/tests/makefiles/Makefile
similarity index 100%
rename from tests/makefile/Makefile
rename to tests/makefiles/Makefile
diff --git a/tests/makefile/test.c b/tests/makefiles/test.c
similarity index 100%
rename from tests/makefile/test.c
rename to tests/makefiles/test.c
diff --git a/tests/makefile_uefi/.gitignore b/tests/makefiles_uefi/.gitignore
similarity index 100%
rename from tests/makefile_uefi/.gitignore
rename to tests/makefiles_uefi/.gitignore
diff --git a/tests/makefile_uefi/Makefile b/tests/makefiles_uefi/Makefile
similarity index 100%
rename from tests/makefile_uefi/Makefile
rename to tests/makefiles_uefi/Makefile
diff --git a/tests/makefile_uefi/efi.h b/tests/makefiles_uefi/efi.h
similarity index 100%
rename from tests/makefile_uefi/efi.h
rename to tests/makefiles_uefi/efi.h
diff --git a/tests/makefile_uefi/test.c b/tests/makefiles_uefi/test.c
similarity index 100%
rename from tests/makefile_uefi/test.c
rename to tests/makefiles_uefi/test.c