diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7a69113c92c..74105492c09 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -264,7 +264,9 @@ jobs:
         status: ${{ job.status }}
   publish:
     name: publish
-    needs: test
+    needs:
+      - test
+      - go_test_shim
     runs-on: pulumi-ubuntu-8core
     steps:
     - name: Checkout Repo
@@ -447,6 +449,26 @@ jobs:
         - dotnet
         - go
         - java
+  go_test_shim:
+      if: github.event_name == 'repository_dispatch' || github.event.pull_request.head.repo.full_name == github.repository
+      name: Run test of provider shim
+      runs-on: ubuntu-latest
+      steps:
+          - name: Checkout Repo
+            uses: actions/checkout@v3
+            with:
+              ref: ${{ env.PR_COMMIT_SHA }}
+              submodules: true
+          - uses: actions/setup-go@v4
+            with:
+              cache-dependency-path: provider/shim/go.sum
+              go-version-file: provider/shim/go.mod
+          - name: go test
+            run: |
+              cd provider/shim
+              go test -v .
+      timeout-minutes: 60
+
 name: main
 on:
   push:
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 86f364f78c3..7d0838fcc8b 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -264,7 +264,9 @@ jobs:
         status: ${{ job.status }}
   publish:
     name: publish
-    needs: test
+    needs:
+      - test
+      - go_test_shim
     runs-on: pulumi-ubuntu-8core
     steps:
     - name: Checkout Repo
@@ -447,6 +449,26 @@ jobs:
         - dotnet
         - go
         - java
+  go_test_shim:
+      if: github.event_name == 'repository_dispatch' || github.event.pull_request.head.repo.full_name == github.repository
+      name: Run test of provider shim
+      runs-on: ubuntu-latest
+      steps:
+          - name: Checkout Repo
+            uses: actions/checkout@v3
+            with:
+              ref: ${{ env.PR_COMMIT_SHA }}
+              submodules: true
+          - uses: actions/setup-go@v4
+            with:
+              cache-dependency-path: provider/shim/go.sum
+              go-version-file: provider/shim/go.mod
+          - name: go test
+            run: |
+              cd provider/shim
+              go test -v .
+      timeout-minutes: 60
+
 name: master
 on:
   push:
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 95bcb4df997..2dc5141dd20 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -215,7 +215,9 @@ jobs:
         status: ${{ job.status }}
   publish:
     name: publish
-    needs: test
+    needs:
+      - test
+      - go_test_shim
     runs-on: pulumi-ubuntu-8core
     steps:
     - name: Checkout Repo
@@ -398,6 +400,26 @@ jobs:
         - dotnet
         - go
         - java
+  go_test_shim:
+      if: github.event_name == 'repository_dispatch' || github.event.pull_request.head.repo.full_name == github.repository
+      name: Run test of provider shim
+      runs-on: ubuntu-latest
+      steps:
+          - name: Checkout Repo
+            uses: actions/checkout@v3
+            with:
+              ref: ${{ env.PR_COMMIT_SHA }}
+              submodules: true
+          - uses: actions/setup-go@v4
+            with:
+              cache-dependency-path: provider/shim/go.sum
+              go-version-file: provider/shim/go.mod
+          - name: go test
+            run: |
+              cd provider/shim
+              go test -v .
+      timeout-minutes: 60
+
 name: prerelease
 on:
   push:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9bdcccc2837..10b134eea9a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -219,7 +219,9 @@ jobs:
         status: ${{ job.status }}
   publish:
     name: publish
-    needs: test
+    needs:
+      - test
+      - go_test_shim
     runs-on: pulumi-ubuntu-8core
     steps:
     - name: Checkout Repo
@@ -417,6 +419,26 @@ jobs:
         - dotnet
         - go
         - java
+  go_test_shim:
+      if: github.event_name == 'repository_dispatch' || github.event.pull_request.head.repo.full_name == github.repository
+      name: Run test of provider shim
+      runs-on: ubuntu-latest
+      steps:
+          - name: Checkout Repo
+            uses: actions/checkout@v3
+            with:
+              ref: ${{ env.PR_COMMIT_SHA }}
+              submodules: true
+          - uses: actions/setup-go@v4
+            with:
+              cache-dependency-path: provider/shim/go.sum
+              go-version-file: provider/shim/go.mod
+          - name: go test
+            run: |
+              cd provider/shim
+              go test -v .
+      timeout-minutes: 60
+
 name: release
 on:
   push:
diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml
index 07b58d1251c..5c15ffdf186 100644
--- a/.github/workflows/run-acceptance-tests.yml
+++ b/.github/workflows/run-acceptance-tests.yml
@@ -242,6 +242,7 @@ jobs:
     name: sentinel
     needs:
     - test
+    - go_test_shim
     runs-on: ubuntu-latest
     steps:
     - name: Is workflow a success
@@ -366,6 +367,26 @@ jobs:
         - dotnet
         - go
         - java
+  go_test_shim:
+      if: github.event_name == 'repository_dispatch' || github.event.pull_request.head.repo.full_name == github.repository
+      name: Run test of provider shim
+      runs-on: ubuntu-latest
+      steps:
+          - name: Checkout Repo
+            uses: actions/checkout@v3
+            with:
+              ref: ${{ env.PR_COMMIT_SHA }}
+              submodules: true
+          - uses: actions/setup-go@v4
+            with:
+              cache-dependency-path: provider/shim/go.sum
+              go-version-file: provider/shim/go.mod
+          - name: go test
+            run: |
+              cd provider/shim
+              go test -v .
+      timeout-minutes: 60
+
 name: run-acceptance-tests
 on:
   pull_request: