diff --git a/.github/workflows/java_tests.yml b/.github/workflows/java_tests.yml
index 17adb6d6f0eb1..a1c82673db9fb 100644
--- a/.github/workflows/java_tests.yml
+++ b/.github/workflows/java_tests.yml
@@ -38,16 +38,6 @@ on:
 
 
 jobs:
-# Commenting out setup-go as it is misconfigured, and blocking java builds
-# See BEAM-13740 and BEAM-12830
-#  setup-go:
-#    runs-on: [ubuntu-latest, macos-latest, windows-latest]
-#    steps:
-#      - uses: actions/checkout@v2
-#      - uses: actions/setup-go@v2
-#        with:
-#          go-version: '1.16.12'
-
   check_gcp_variables:
     timeout-minutes: 5
     name: "Check GCP variables set"
@@ -117,7 +107,6 @@ jobs:
           path: runners/core-java/build/reports/tests/test
 
   java_wordcount_direct_runner:
-#    needs: setup-go
     name: 'Java Wordcount Direct Runner'
     runs-on: ${{ matrix.os }}
     strategy:
@@ -130,6 +119,10 @@ jobs:
         with:
           persist-credentials: false
           submodules: recursive
+      - name: Install go
+        uses: actions/setup-go@v2
+        with:
+          go-version: '1.16.12'
       - name: Run WordCount Unix
         uses: ./.github/actions/gradle-command-action
         with:
@@ -147,7 +140,6 @@ jobs:
     name: 'Java Wordcount Dataflow'
     needs:
       - check_gcp_variables
-#      - setup-go
     runs-on: ${{ matrix.os }}
     if: |
       needs.check_gcp_variables.outputs.gcp-variables-set == 'true' && (
@@ -164,6 +156,10 @@ jobs:
         with:
           persist-credentials: false
           submodules: recursive
+      - name: Install go
+        uses: actions/setup-go@v2
+        with:
+          go-version: '1.16.12'
       - name: Authenticate on GCP
         uses: google-github-actions/setup-gcloud@master
         with:
diff --git a/.github/workflows/python_tests.yml b/.github/workflows/python_tests.yml
index 55c36d24b53a0..eb0844d425dcc 100644
--- a/.github/workflows/python_tests.yml
+++ b/.github/workflows/python_tests.yml
@@ -38,14 +38,6 @@ on:
 
 jobs:
 
-  setup-go:
-    runs-on: [ubuntu-latest, macos-latest, windows-latest]
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
-        with:
-          go-version: '1.16.12'
-
   check_gcp_variables:
     timeout-minutes: 5
     name: "Check GCP variables"
@@ -176,7 +168,6 @@ jobs:
     name: 'Python Wordcount Dataflow'
     needs:
       - build_python_sdk_source
-      - setup-go
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -195,6 +186,10 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python }}
+      - name: Install go
+        uses: actions/setup-go@v2
+        with:
+          go-version: '1.16.12'
       - name: Download source from artifacts
         uses: actions/download-artifact@v2
         with: