diff --git a/.github/workflows/doctor.yml b/.github/workflows/doctor.yml
index 9a1c57de85..6cfcff8c73 100644
--- a/.github/workflows/doctor.yml
+++ b/.github/workflows/doctor.yml
@@ -8,20 +8,22 @@ on:
       - Library/Homebrew/extend/os/diagnostic.rb
       - Library/Homebrew/extend/os/mac/diagnostic.rb
       - Library/Homebrew/os/mac/xcode.rb
-    branches-ignore:
-      - master
 env:
   HOMEBREW_DEVELOPER: 1
   HOMEBREW_NO_AUTO_UPDATE: 1
+  HOMEBREW_CHANGE_ARCH_TO_ARM: 1
 jobs:
   tests:
     strategy:
       matrix:
-        version: [10.15, 10.14, 10.13]
+        version: ['11-arm', '11.0', '10.15', '10.14']
       fail-fast: false
     runs-on: ${{ matrix.version }}
     env:
-      PATH: "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+      PATH: "/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+    defaults:
+      run:
+        working-directory: /tmp
     steps:
       - name: Set up Homebrew
         id: set-up-homebrew