diff --git a/.github/workflows/forbid-todos.yml b/.github/workflows/forbid-todos.yml
new file mode 100644
index 00000000000..84cba26a178
--- /dev/null
+++ b/.github/workflows/forbid-todos.yml
@@ -0,0 +1,15 @@
+name: Forbid TODOs
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+  merge_group:
+    branches: [main]
+
+jobs:
+  forbid-todos:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Forbid TODOs
+        run: ./scripts/forbid-todo.sh
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index df66cba4bf4..c975db71b5d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -72,5 +72,3 @@ jobs:
           name: dumps
           path: ${{ env.VSCODE_CRASH_DIR }}
         if: failure()
-      - name: Forbid TODOs
-        run: ./scripts/forbid-todo.sh