diff --git a/.github/workflows/macos-cmake.yaml b/.github/workflows/macos-cmake.yaml
new file mode 100644
index 000000000..8c6a41f37
--- /dev/null
+++ b/.github/workflows/macos-cmake.yaml
@@ -0,0 +1,20 @@
+name: MacOS (cmake) Build and Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Update brew repos
+      run: brew update
+    - name: Tap RfidResearchGroup/proxmark3
+      run: brew tap RfidResearchGroup/proxmark3
+    - name: Install dependencies
+      run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc
+    - name: Build
+      run: mkdir -p client/build && ( cd client/build && cmake .. && make VERBOSE=1 )
+    - name: Test
+      run: make client/check CHECKARGS="--clientbin ./client/build/proxmark3"
diff --git a/.github/workflows/macos-make-btaddon.yml b/.github/workflows/macos-make-btaddon.yml
new file mode 100644
index 000000000..9d5b75ff7
--- /dev/null
+++ b/.github/workflows/macos-make-btaddon.yml
@@ -0,0 +1,20 @@
+name: MacOS (make with BTADDON) Build and Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Update brew repos
+      run: brew update
+    - name: Tap RfidResearchGroup/proxmark3
+      run: brew tap RfidResearchGroup/proxmark3
+    - name: Install dependencies
+      run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc
+    - name: Build
+      run: make clean && make V=1 PLATFORM_EXTRAS=BTADDON
+    - name: Test
+      run: make check
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos-make.yml
similarity index 81%
rename from .github/workflows/macos.yml
rename to .github/workflows/macos-make.yml
index 3eb0b8584..a612bcda2 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos-make.yml
@@ -1,4 +1,4 @@
-name: MacOS Build and Test
+name: MacOS (make) Build and Test
 
 on: [push, pull_request]
 
@@ -8,8 +8,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Brew python bug workaround
-      run: brew link --overwrite python
     - name: Update brew repos
       run: brew update
     - name: Tap RfidResearchGroup/proxmark3