diff --git a/.github/mergify.yml b/.github/mergify.yml
deleted file mode 100644
index 14222db1094..00000000000
--- a/.github/mergify.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-pull_request_rules:
-  - name: Automatic merge
-    conditions:
-      - "#approved-reviews-by>=1"
-      - label=automerge
-      - status-success=Lint
-      - status-success=Test Successful
-      - status-success=Docker Test Successful
-      - status-success=Windows Test Successful
-      - status-success=MinGW
-    actions:
-      merge:
-        method: merge
diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml
index 080a1bc5f04..fbf6aa6003d 100644
--- a/.github/workflows/test-docker.yml
+++ b/.github/workflows/test-docker.yml
@@ -108,9 +108,12 @@ jobs:
   success:
     permissions:
       contents: none
+    if: always()
     needs: build
     runs-on: ubuntu-latest
     name: Docker Test Successful
     steps:
       - name: Success
-        run: echo Docker Test Successful
+        env:
+          BUILD_RESULT: ${{ needs.build.result }}
+        run: test "$BUILD_RESULT" = "success"
diff --git a/.github/workflows/test-skipped.yml b/.github/workflows/test-skipped.yml
new file mode 100644
index 00000000000..536868a2122
--- /dev/null
+++ b/.github/workflows/test-skipped.yml
@@ -0,0 +1,58 @@
+# Report success for required status checks when the real test workflows are
+# skipped by their paths-ignore filters, so that, for example, PRs only touching
+# docs can still be merged under a ruleset requiring these checks. See
+# https://docs.github.com/en/pull-requests/how-tos/merge-and-close-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks
+#
+# Keep the paths below in sync with the paths-ignore lists in test.yml,
+# test-docker.yml, test-mingw.yml and test-windows.yml.
+
+name: Test skipped
+
+on:
+  push:
+    branches:
+      - "**"
+    paths:
+      - ".github/workflows/docs.yml"
+      - ".github/workflows/wheels*"
+      - ".gitmodules"
+      - "docs/**"
+      - "wheels/**"
+  pull_request:
+    paths:
+      - ".github/workflows/docs.yml"
+      - ".github/workflows/wheels*"
+      - ".gitmodules"
+      - "docs/**"
+      - "wheels/**"
+
+permissions: {}
+
+jobs:
+  test:
+    runs-on: ubuntu-slim
+    name: Test Successful
+    steps:
+      - name: Success
+        run: echo Tests not required for this change
+
+  test-docker:
+    runs-on: ubuntu-slim
+    name: Docker Test Successful
+    steps:
+      - name: Success
+        run: echo Tests not required for this change
+
+  test-mingw:
+    runs-on: ubuntu-slim
+    name: MinGW
+    steps:
+      - name: Success
+        run: echo Tests not required for this change
+
+  test-windows:
+    runs-on: ubuntu-slim
+    name: Windows Test Successful
+    steps:
+      - name: Success
+        run: echo Tests not required for this change
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 9ac0f1fdaa7..b5e3a7f46a1 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -232,9 +232,12 @@ jobs:
   success:
     permissions:
       contents: none
+    if: always()
     needs: build
     runs-on: ubuntu-latest
     name: Windows Test Successful
     steps:
       - name: Success
-        run: echo Windows Test Successful
+        env:
+          BUILD_RESULT: ${{ needs.build.result }}
+        run: test "$BUILD_RESULT" = "success"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index af41e96e783..e7430ef6edc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -164,9 +164,12 @@ jobs:
   success:
     permissions:
       contents: none
+    if: always()
     needs: build
     runs-on: ubuntu-latest
     name: Test Successful
     steps:
       - name: Success
-        run: echo Test Successful
+        env:
+          BUILD_RESULT: ${{ needs.build.result }}
+        run: test "$BUILD_RESULT" = "success"