diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ec960bb4..28aa7eec 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,6 +18,10 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+        test_type:
+          - "core"
+          - "extended"
+    name: Python ${{ matrix.python-version }} ${{ matrix.test_type }}
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
@@ -25,8 +29,16 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           poetry-version: "1.4.2"
-          cache-key: "main"
-          install-command: "poetry install"
-      - name: Run unit tests
+          cache-key: ${{ matrix.test_type }}
+          install-command: |
+              if [ "${{ matrix.test_type }}" == "core" ]; then
+                echo "Running core tests, installing dependencies with poetry..."
+                poetry install
+              else
+                echo "Running extended tests, installing dependencies with poetry..."
+                poetry install -E extended_testing
+              fi
+      - name: Run $${{matrix.test_type}} tests
         run: |
-          make test
+          make tests
+        shell: bash
diff --git a/.github/workflows/test_all.yml b/.github/workflows/test_all.yml
deleted file mode 100644
index d914a16f..00000000
--- a/.github/workflows/test_all.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Run unit tests with all optional packages installed.
-name: test_all
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-
-env:
-  POETRY_VERSION: "1.4.2"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version:
-          - "3.8"
-          - "3.9"
-          - "3.10"
-          - "3.11"
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: "./.github/actions/poetry_setup"
-        with:
-          python-version: ${{ matrix.python-version }}
-          poetry-version: "1.4.2"
-          cache-key: "extended"
-          install-command: "poetry install -E extended_testing"
-      - name: Run unit tests
-        run: |
-          make test