diff --git a/.automation/test/golang/bad/go.mod b/.automation/test/golang/bad/go.mod
new file mode 100644
index 00000000000..d94ed42c3a0
--- /dev/null
+++ b/.automation/test/golang/bad/go.mod
@@ -0,0 +1,3 @@
+module megalinter.io/test-bad
+
+go 1.22
diff --git a/.automation/test/golang/golang_bad_01.go b/.automation/test/golang/bad/golang_bad_01.go
similarity index 100%
rename from .automation/test/golang/golang_bad_01.go
rename to .automation/test/golang/bad/golang_bad_01.go
diff --git a/.automation/test/golang/golang_bad_02.go b/.automation/test/golang/bad/golang_bad_02.go
similarity index 100%
rename from .automation/test/golang/golang_bad_02.go
rename to .automation/test/golang/bad/golang_bad_02.go
diff --git a/.automation/test/golang/fix/go.mod b/.automation/test/golang/fix/go.mod
new file mode 100644
index 00000000000..8bd378cfc86
--- /dev/null
+++ b/.automation/test/golang/fix/go.mod
@@ -0,0 +1,3 @@
+module megalinter.io/test-fix
+
+go 1.22
diff --git a/.automation/test/golang/golang_fix_01.go b/.automation/test/golang/fix/golang_fix_01.go
similarity index 100%
rename from .automation/test/golang/golang_fix_01.go
rename to .automation/test/golang/fix/golang_fix_01.go
diff --git a/.automation/test/golang/golang_fix_02.go b/.automation/test/golang/fix/golang_fix_02.go
similarity index 100%
rename from .automation/test/golang/golang_fix_02.go
rename to .automation/test/golang/fix/golang_fix_02.go
diff --git a/.automation/test/golang/good/go.mod b/.automation/test/golang/good/go.mod
new file mode 100644
index 00000000000..47e39d859c1
--- /dev/null
+++ b/.automation/test/golang/good/go.mod
@@ -0,0 +1,3 @@
+module megalinter.io/test-good
+
+go 1.22
diff --git a/.automation/test/golang/golang_good_01.go b/.automation/test/golang/good/golang_good_01.go
similarity index 88%
rename from .automation/test/golang/golang_good_01.go
rename to .automation/test/golang/good/golang_good_01.go
index 7fab233f9c0..de893ae7832 100644
--- a/.automation/test/golang/golang_good_01.go
+++ b/.automation/test/golang/good/golang_good_01.go
@@ -1,5 +1,5 @@
 // This is a package comment
-package main
+package good
 
 import "fmt"
 
diff --git a/.automation/test/golang/golang_good_02.go b/.automation/test/golang/good/golang_good_02.go
similarity index 87%
rename from .automation/test/golang/golang_good_02.go
rename to .automation/test/golang/good/golang_good_02.go
index 0ee059a0e1f..de27277b332 100644
--- a/.automation/test/golang/golang_good_02.go
+++ b/.automation/test/golang/good/golang_good_02.go
@@ -1,5 +1,5 @@
 // This is a package comment
-package main
+package good
 
 import "fmt"
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbf4b5469f2..8a6282b4f54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l
 - Reporters
 
 - Fixes
+  - Change `golangci-lint` lint mode to `project`
 
 - Doc
 
diff --git a/megalinter/descriptors/go.megalinter-descriptor.yml b/megalinter/descriptors/go.megalinter-descriptor.yml
index 9556dd683d8..ad7fa7338ee 100644
--- a/megalinter/descriptors/go.megalinter-descriptor.yml
+++ b/megalinter/descriptors/go.megalinter-descriptor.yml
@@ -16,7 +16,7 @@ linters:
     linter_rules_configuration_url: https://golangci-lint.run/usage/configuration/#config-file
     linter_rules_inline_disable_url: https://golangci-lint.run/usage/false-positives/#nolint
     config_file_name: .golangci.yml
-    cli_lint_mode: list_of_files
+    cli_lint_mode: project
     cli_lint_extra_args:
       - "run"
     cli_lint_fix_arg_name: --fix