diff --git a/.gitlint b/.gitlint
deleted file mode 100644
index e7218ac53..000000000
--- a/.gitlint
+++ /dev/null
@@ -1,11 +0,0 @@
-[general]
-fail-without-commits=True
-regex-style-search=True
-contrib=CC1
-
-[title-match-regex]
-regex=^\[\#[0-9Xx]+\]\s
-
-[ignore-by-title]
-regex=^Release(.*)
-ignore=title-match-regex
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f66adda0b..13284b9c5 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,13 +2,6 @@ ci:
   autofix_prs: false
 
 repos:
-  - repo: https://github.com/jorisroovers/gitlint
-    rev:  v0.19.1
-    hooks:
-      - id: gitlint
-        stages: [commit-msg]
-      - id: gitlint-ci
-
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
     hooks:
@@ -42,7 +35,7 @@ repos:
     hooks:
        - id: go-unit-tests
          name: go unit tests
-         entry: make test
+         entry: make test GOFLAGS=''
          pass_filenames: false
          types: [go]
          language: system
diff --git a/Makefile b/Makefile
index 21d7d4275..4d3c121bf 100755
--- a/Makefile
+++ b/Makefile
@@ -168,9 +168,10 @@ fumpt:
 	@gofumpt -l -w cmd/ pkg/ misc/
 
 # Run Unit Test with go test
+test: GOFLAGS ?= "-count=1"
 test:
 	@echo "⇒ Running go test"
-	@go test ./... -count=1
+	@GOFLAGS="$(GOFLAGS)" go test ./...
 
 # Run pre-commit
 pre-commit-run: