diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 6a9d217b0..dbd885350 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -28,6 +28,8 @@ jobs:
           check-latest: true
       - name: Test source headers are present
         run: make test-source-headers
+      - name: Check if go modules need to be tidied
+        run: go mod tidy -diff
       - name: Run unit tests
         run: make test-coverage
       - name: Test build
diff --git a/Makefile b/Makefile
index 8dfa3344c..5e424bf05 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ all: build
 #  build
 
 .PHONY: build
-build: $(BINDIR)/$(BINNAME)
+build: $(BINDIR)/$(BINNAME) tidy
 
 $(BINDIR)/$(BINNAME): $(SRC)
 	CGO_ENABLED=$(CGO_ENABLED) go build $(GOFLAGS) -trimpath -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o '$(BINDIR)'/$(BINNAME) ./cmd/helm
@@ -243,3 +243,7 @@ info:
 	@echo "Git Tag:           ${GIT_TAG}"
 	@echo "Git Commit:        ${GIT_COMMIT}"
 	@echo "Git Tree State:    ${GIT_DIRTY}"
+
+.PHONY: tidy
+tidy:
+	go mod tidy