diff --git a/.github/workflows/macos-build-and-test.yml b/.github/workflows/macos.yml
similarity index 100%
rename from .github/workflows/macos-build-and-test.yml
rename to .github/workflows/macos.yml
diff --git a/.github/workflows/ubuntu-cmake.yml b/.github/workflows/ubuntu-cmake.yml
new file mode 100644
index 000000000..539ac252d
--- /dev/null
+++ b/.github/workflows/ubuntu-cmake.yml
@@ -0,0 +1,20 @@
+name: Ubuntu (cmake) Build and Test
+
+on: [push, pull_request]
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Update apt repos
+      run: sudo apt-get update
+    - name: Update packages
+      run: sudo apt-get upgrade -yqq
+    - name: Install dependencies
+      run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed
+    - 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/ubuntu-make-btaddon.yml b/.github/workflows/ubuntu-make-btaddon.yml
new file mode 100644
index 000000000..e8de696a7
--- /dev/null
+++ b/.github/workflows/ubuntu-make-btaddon.yml
@@ -0,0 +1,20 @@
+name: Ubuntu (make with BTADDON) Build and Test
+
+on: [push, pull_request]
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Update apt repos
+      run: sudo apt-get update
+    - name: Update packages
+      run: sudo apt-get upgrade -yqq
+    - name: Install dependencies
+      run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed
+    - name: Build
+      run: make clean && make V=1 PLATFORM_EXTRAS=BTADDON
+    - name: Test
+      run: make check
diff --git a/.github/workflows/ubuntu-build-and-test.yml b/.github/workflows/ubuntu-make.yml
similarity index 92%
rename from .github/workflows/ubuntu-build-and-test.yml
rename to .github/workflows/ubuntu-make.yml
index 8bc11dbbf..958c9c35d 100644
--- a/.github/workflows/ubuntu-build-and-test.yml
+++ b/.github/workflows/ubuntu-make.yml
@@ -1,9 +1,9 @@
-name: Ubuntu Build and Test
+name: Ubuntu (make) Build and Test
 
 on: [push, pull_request]
 
 jobs:
-  build:
+  build-and-test:
     runs-on: ubuntu-latest
 
     steps: