diff --git a/.github/workflows/e2eTests.yaml b/.github/workflows/e2eTests.yaml
index d3cc80b832..29391d5864 100644
--- a/.github/workflows/e2eTests.yaml
+++ b/.github/workflows/e2eTests.yaml
@@ -10,7 +10,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v2
       with:
-        go-version: ^1.15
+        go-version: ^1.17
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
     - name: Run tests
diff --git a/Makefile b/Makefile
index 88f738949f..b459e59470 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ endif
 GO_VERSION=1.17.2
 
 # K8s version used for Makefile helpers
-K8S_VERSION=v1.6.6
+K8S_VERSION=v1.22.3
 
 GOARM=7
 
@@ -73,7 +73,11 @@ test: header-check gofmt verify-modules
 	# Run the unit tests
 	# NET_ADMIN capacity is required to do some network operation
 	# SYS_ADMIN capacity is required to create network namespace
-	docker run --cap-add=NET_ADMIN --cap-add=SYS_ADMIN --rm -v $(shell pwd):/go/src/github.com/flannel-io/flannel golang:$(GO_VERSION) go test -v -cover $(TEST_PACKAGES_EXPANDED)
+	docker run --cap-add=NET_ADMIN \
+		--cap-add=SYS_ADMIN --rm \
+		-v $(shell pwd):/go/src/github.com/flannel-io/flannel \
+		golang:$(GO_VERSION) \
+		/bin/bash -c 'cd /go/src/github.com/flannel-io/flannel && go test -v -cover $(TEST_PACKAGES_EXPANDED)'
 
 	# Test the docker-opts script
 	cd dist; ./mk-docker-opts_tests.sh