diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 32cc396..b101a6d 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -11,22 +11,24 @@ on:
 
 jobs:
   build-and-test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest, ubuntu-latest]
     steps:
-      - name: Checkout code
+      - name: Checkout Code
         uses: actions/checkout@v7
 
-      - name: Install Opendylan
+      - name: Install Open Dylan
         uses: dylan-lang/install-opendylan@v3
 
-      - name: Download dependencies
-        run: dylan update
+      - name: Install Dependencies
+        run: deft update
 
-      - name: Build tests
-        run: dylan build base64-test-suite
-
-      - name: Run tests
-        run: _build/bin/base64-test-suite --progress none --report surefire > _build/TEST-base64.xml
+      - name: Build and Run Tests
+        run: |
+          mkdir -p _build  # can't redirect without it
+          deft test -- --progress none --report surefire > _build/TEST-base64.xml
 
       - name: Publish Test Report
         if: success() || failure()
diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
index 1767466..69393f0 100644
--- a/.github/workflows/build-docs.yml
+++ b/.github/workflows/build-docs.yml
@@ -27,30 +27,30 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v7
 
-      - name: Check links
+      - name: Check Links
         uses: addnab/docker-run-action@v3
         with:
           image: ghcr.io/fraya/dylan-docs
           options: -v ${{ github.workspace }}/documentation:/docs
           run: make linkcheck
 
-      - name: Build docs with Furo theme
+      - name: Build Docs with Furo Theme
         uses: addnab/docker-run-action@v3
         with:
           image: ghcr.io/fraya/dylan-docs
           options: -v ${{ github.workspace }}/documentation:/docs
           run: make html
 
-      - name: Upload html artifact
+      - name: Upload HTML Artifact
         uses: actions/upload-artifact@v7
         with:
           name: base64-doc-html
           path: documentation/build/html/
 
-      - name: Bypassing Jekyll on GH Pages
+      - name: Bypass Jekyll on GitHub Pages
         run: sudo touch documentation/build/html/.nojekyll
 
-      - name: Deploy documents to GH pages
+      - name: Deploy to GitHub Pages
         uses: JamesIves/github-pages-deploy-action@v4
         with:
           folder: documentation/build/html