diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 4ca15eb..63caec5 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -6,9 +6,6 @@ on:
     paths-ignore:
       - 'documentation/**'
   pull_request:
-    branches:
-      - main
-      - master
     paths-ignore:
       - 'documentation/**'
 
@@ -17,24 +14,25 @@ on:
 
 jobs:
   build-and-test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest, ubuntu-latest]
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v7
 
-      - uses: actions/checkout@v7
+      - name: Install Open Dylan
+        uses: dylan-lang/install-opendylan@v3
 
-      - uses: dylan-lang/install-opendylan@v3
+      - name: Install dependencies
+        run: deft update
 
-      - name: Update packages
-        run: dylan update
-
-      - name: Build binary-data-test
-        run: dylan build binary-data-test
-
-      - name: Run binary-data-tests-test
-        run: _build/bin/binary-data-test --progress none --report surefire > _build/TEST-binary-data.xml
+      - name: Build and Run Tests
+        run: deft test -- --report surefire --report-file _build/test-output.xml
 
       - name: Publish Test Report
         if: success() || failure()
         uses: mikepenz/action-junit-report@v6
         with:
-          report_paths: '**/_build/TEST-*.xml'
+          report_paths: '**/_build/test-output.xml'