diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml
index 9f8d82a9..17244a75 100644
--- a/.github/workflows/go-tests.yml
+++ b/.github/workflows/go-tests.yml
@@ -31,7 +31,7 @@ jobs:
           go-version: 'stable'
       - uses: actions/checkout@v3
       - name: make lint
-        run: make golangci-lint && GOLANGCI_LINT_EXTRA_ARGS="--timeout=1m --build-tags testing" make lint
+        run: make golangci-lint && GOLANGCI_LINT_EXTRA_ARGS="--timeout=8m --build-tags testing" make lint
       - name: Verify go vendor, go modules and gofmt
         run: |
           sudo apt-get install -y jq
diff --git a/Makefile b/Makefile
index a68d14c1..8f4d2009 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ release: build-static create-release-files ## Create a release
 ##@ Lint / Verify
 .PHONY: lint
 lint: golangci-lint $(GOLANGCI_LINT) ## Run linting.
-	$(GOLANGCI_LINT) run -v $(GOLANGCI_LINT_EXTRA_ARGS)
+	$(GOLANGCI_LINT) run -v --build-tags testing $(GOLANGCI_LINT_EXTRA_ARGS)
 
 .PHONY: lint-fix
 lint-fix: golangci-lint $(GOLANGCI_LINT) ## Lint the codebase and run auto-fixers if supported by the linte