diff --git a/.github/workflows/doctor.yml b/.github/workflows/doctor.yml
index db7a03e368..a8c2c325b5 100644
--- a/.github/workflows/doctor.yml
+++ b/.github/workflows/doctor.yml
@@ -38,8 +38,9 @@ jobs:
         uses: Homebrew/actions/setup-homebrew@master
 
       - run: brew test-bot --only-cleanup-before
+        if: !contains(matrix.runner, github.run_id)
 
-      - run: brew test-bot --only-setup
+      - run: brew doctor
 
       - run: brew test-bot --only-cleanup-after
-        if: always()
+        if: always() && !contains(matrix.runner, github.run_id)