diff --git a/.github/actions/go-common/action.yml b/.github/actions/go-common/action.yml
index 29780b04..2b374deb 100644
--- a/.github/actions/go-common/action.yml
+++ b/.github/actions/go-common/action.yml
@@ -45,7 +45,7 @@ runs:
     - name: Install gotip
       if: matrix.go-version == 'tip'
       run: |
-        git clone --depth=1 https://go.googlesource.com/go "$GOTIP_PATH" || true
+        git clone --depth=1 https://github.com/golang/go "$GOTIP_PATH" || true
         cd "$GOTIP_PATH"
         git pull
         echo "GOROOT=$GOTIP_PATH" >> "$GITHUB_ENV"
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 6e5642e3..af1530ff 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
 
   test:
-    timeout-minutes: 10
+    timeout-minutes: 30
     runs-on: ubuntu-latest
     strategy:
       matrix: