diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9222e2d..9fe8b12 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,4 +17,4 @@ jobs:
     - uses: cachix/install-nix-action@v19
       with:
         nix_path: nixpkgs=channel:nixos-unstable
-    - run: nix-shell --run 'make test'
+    - run: nix-shell --run 'PATH=$(go env GOPATH)/bin:$PATH make test'
diff --git a/Makefile b/Makefile
index 12fc201..527b743 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,8 @@ TEST_TARGETS := $(addsuffix .test,$(TEST_FILES))
 GOPLATFORMS := darwin_arm64 darwin_amd64 linux_arm64 linux_amd64 windows
 GLJIMPORTS=$(foreach platform,$(GOPLATFORMS),pkg/gen/gljimports/gljimports_$(platform).go)
 
-GO_VERSION := 1.19.3 # eventually, support multiple minor versions
+# eventually, support multiple minor versions
+GO_VERSION := 1.19.3
 GO_CMD := go$(GO_VERSION)
 
 .PHONY: all
@@ -19,7 +20,9 @@ all: $(STDLIB_TARGETS) generate $(GLJIMPORTS)
 
 .PHONY: gocmd
 gocmd:
-	@go$(GO_VERSION) version > /dev/null || (go install golang.org/dl/$(GO_VERSION) && $(GO_CMD) version)
+	@$(GO_CMD) version 2>&1 > /dev/null || \
+		(go install "golang.org/dl/$(GO_CMD)@latest" && \
+		$(GO_CMD) download > /dev/null && $(GO_CMD) version > /dev/null)
 
 .PHONY: generate
 generate: