diff --git a/.circleci/config.yml b/.circleci/config.yml
index 30441dd..84fd9c7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,12 +9,6 @@ shared_configs:
 # Use the latest 2.1 version of CircleCI pipeline process engine. See: https://circleci.com/docs/2.0/configuration-reference
 version: 2.1
 jobs:
-  build-1-21:
-    working_directory: ~/repo
-    docker:
-      - image: cimg/go:1.21
-    steps: *simple_job_steps
-
   build-1-22:
     working_directory: ~/repo
     docker:
@@ -25,6 +19,12 @@ jobs:
     working_directory: ~/repo
     docker:
       - image: cimg/go:1.23
+    steps: *simple_job_steps
+
+  build-1-24:
+    working_directory: ~/repo
+    docker:
+      - image: cimg/go:1.24
     steps:
       - checkout
       - run:
@@ -35,6 +35,6 @@ jobs:
 workflows:
   pr-build-test:
     jobs:
-      - build-1-21
       - build-1-22
       - build-1-23
+      - build-1-24
diff --git a/Makefile b/Makefile
index abaaff5..5f8f884 100644
--- a/Makefile
+++ b/Makefile
@@ -50,9 +50,9 @@ generate: .tmp/protoc/bin/protoc
 
 .PHONY: checkgenerate
 checkgenerate: generate
-	git status --porcelain
-	@if [ -n "$$(git status --porcelain)" ]; then \
-		git diff; \
+	git status --porcelain -- '**/*.go'
+	@if [ -n "$$(git status --porcelain -- '**/*.go')" ]; then \
+		git diff -- '**/*.go'; \
 		exit 1; \
 	fi
 
@@ -69,7 +69,7 @@ vet:
 
 .PHONY: staticcheck
 staticcheck:
-	@go install honnef.co/go/tools/cmd/staticcheck@v0.5.1
+	@go install honnef.co/go/tools/cmd/staticcheck@2025.1.1
 	staticcheck -checks "inherit,-SA1019" ./...
 
 .PHONY: ineffassign
@@ -79,7 +79,7 @@ ineffassign:
 
 .PHONY: predeclared
 predeclared:
-	@go install github.com/nishanths/predeclared@245576f9a85c
+	@go install github.com/nishanths/predeclared@51e8c974458a0f93dc03fe356f91ae1a6d791e6f
 	predeclared ./...
 
 # Intentionally omitted from CI, but target here for ad-hoc reports.
@@ -95,8 +95,7 @@ errcheck:
 	errcheck ./...
 
 .PHONY: test
-test:
-	# The race detector requires CGO: https://github.com/golang/go/issues/6508
+test: deps
 	CGO_ENABLED=1 go test -race ./...
 
 .tmp/protoc/bin/protoc: ./Makefile ./download_protoc.sh