diff --git a/.github/workflows/pr-go-mod-tidy-mocks.yml b/.github/workflows/pr-go-mod-tidy-mocks.yml
new file mode 100644
index 000000000000..4e243540c063
--- /dev/null
+++ b/.github/workflows/pr-go-mod-tidy-mocks.yml
@@ -0,0 +1,48 @@
+name: 'PR Go Mod Tidy and Mocks'
+on:
+  pull_request:
+    branches:
+      - main
+
+concurrency:
+  group: ci-${{ github.ref }}-pr-go-mod-tidy-mocks
+  cancel-in-progress: true
+
+jobs:
+  go-mod-tidy:
+    name: Check go mod tidy
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 'stable'
+      - name: Run go mod tidy
+        run: ./scripts/go-mod-tidy-all.sh
+      - name: Check for diffs
+        run: |
+          git diff --exit-code || {
+            echo "Please run './scripts/go-mod-tidy-all.sh' and commit the changes";
+            exit 1;
+          }
+
+  generate-mocks:
+    name: Generate Mocks
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 'stable'
+      - name: Generate mocks
+        run: make mocks
+      - name: Check for diffs
+        run: |
+          git diff --exit-code || {
+            echo "Please run 'make mocks' and commit the changes";
+            exit 1;
+          }