diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
index 484b73a..d95c683 100644
--- a/.github/workflows/linux-ci.yml
+++ b/.github/workflows/linux-ci.yml
@@ -9,6 +9,14 @@ jobs:
   validate:
     runs-on: ubuntu-22.04
     steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version-file: 'go.mod'
+
       # golangci-lint is required by test.sh. Latest version here if you want
       # to bump it, version number is at the end of the "curl | sh"
       # commandline below:
@@ -16,13 +24,4 @@ jobs:
       - name: Install golangci-lint
         run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)"/bin v1.50.1
 
-      # Source: https://www.scivision.dev/github-actions-path-append/
-      #
-      # Required for the golangci-lint that we just installed to work.
-      - name: Add GOPATH/bin to PATH
-        run: echo "$(go env GOPATH)/bin" >> "$GITHUB_PATH"
-
-      - name: Check out repository code
-        uses: actions/checkout@v2
-
       - run: ./test.sh
diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
index 62a68cd..b09f7e3 100644
--- a/.github/workflows/windows-ci.yml
+++ b/.github/workflows/windows-ci.yml
@@ -11,5 +11,9 @@ jobs:
     steps:
       - name: Check out repository code
         uses: actions/checkout@v2
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version-file: 'go.mod'
       - run: go build
       - run: go test -timeout 30s ./...