diff --git a/.github/workflows/flaky-tests-bypass.yaml b/.github/workflows/flaky-tests-bypass.yaml
new file mode 100644
index 00000000000..d4a1c3e020f
--- /dev/null
+++ b/.github/workflows/flaky-tests-bypass.yaml
@@ -0,0 +1,27 @@
+# This workflow is required to ensure that required Github check passes even if
+# the actual "Flaky Tests Detector" workflow is skipped due to path filtering. Otherwise
+# it will stay forever pending.  Another bypass is used for the merge queue.
+#
+# See "Handling skipped but required checks" for more info:
+#
+# https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks
+#
+# Note both workflows must have the same name.
+name: Flaky Tests Detector
+run-name: Flaky Tests Detector
+
+on:
+  pull_request:
+    paths-ignore:
+      - '**.go'
+      - '.github/workflows/flaky-tests.yaml'
+jobs:
+  test:
+    name: Flaky Tests Detector
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: none
+
+    steps:
+      - run: 'echo "No changes to verify"'