diff --git a/.github/workflows/unit-test-tgc.yml b/.github/workflows/unit-test-tgc.yml
index 4179d60f254b..91c4fe3ae27d 100644
--- a/.github/workflows/unit-test-tgc.yml
+++ b/.github/workflows/unit-test-tgc.yml
@@ -8,6 +8,21 @@ jobs:
   compile-and-unit-tests:
     runs-on: ubuntu-22.04
     steps:
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: '^1.19'
+
+      - name: Cache Go modules and build cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-test-terraform-google-conversion-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-test-terraform-google-conversion-${{ hashFiles('**/go.sum') }}
+            ${{ runner.os }}-test-terraform-google-conversion-
+
       - name: Download built artifacts
         uses: actions/download-artifact@v2
         with:
@@ -23,29 +38,15 @@ jobs:
       - name: Unzip the artifacts and delete the zip
         run: |
           unzip artifacts-tgc/output.zip -d ./tgc
-          unzip artifacts-tpgb/output.zip -d ./tpgb
+          unzip artifacts-tpgb/output.zip -d ~/go/src/github.com/hashicorp/terraform-provider-google-beta/google-beta
           rm artifacts-tgc/output.zip
           rm artifacts-tpgb/output.zip
 
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: '^1.19'
-
-      - name: Cache Go modules and build cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-test-terraform-google-conversion-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-test-terraform-google-conversion-${{ hashFiles('**/go.sum') }}
-            ${{ runner.os }}-test-terraform-google-conversion-
-
       - name: Build Terraform Google Conversion
         run: |
+          export GOPATH=~/go
           cd tgc
-          go mod edit -replace=github.com/hashicorp/terraform-provider-google-beta=../tpgb
+          go mod edit -replace=github.com/hashicorp/terraform-provider-google-beta=$GOPATH/src/github.com/hashicorp/terraform-provider-google-beta/google-beta
           go mod tidy
           make build