diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index f45b41833..9f1ce35f9 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -29,6 +29,7 @@ jobs:
         mv bin/gvproxy.exe bin/gvproxy-windowsgui.exe
 
     - uses: actions/upload-artifact@v3
+      if: ${{ matrix.go-version }} == '1.21.x'
       with:
         name: gvisor-tap-vsock-binaries
         path: bin/*
diff --git a/Makefile b/Makefile
index fb0118e93..00f2c082f 100644
--- a/Makefile
+++ b/Makefile
@@ -66,4 +66,4 @@ test-companion:
 
 .PHONY: test
 test: gvproxy test-companion
-	go test -v ./...
+	go test -timeout 20m -v ./...