diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint_and_test.yaml
similarity index 50%
rename from .github/workflows/lint.yaml
rename to .github/workflows/lint_and_test.yaml
index 7dd523f..b2fe0fc 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint_and_test.yaml
@@ -1,26 +1,31 @@
-name: Lint
-
+name: Lint and Test
 
 on:
   push:
-    branches: [ master, main ]
+    branches: [master, main]
   pull_request:
-    branches: [ master, main ]
-
+    branches: [master, main]
 
 jobs:
-  test:
-    name: Lint
+  lint_and_test:
+    name: Lint and Test
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        python-version: [3.8, 3.10, 3.12]
+
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
+          python-version: ${{ matrix.python-version }}
 
       - name: Install Requirements
         run: pip install .[dev,mouthing,server]
 
       - name: Lint Code
         run: pylint signwriting
+
+      - name: Test Code
+        run: pytest signwriting
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
deleted file mode 100644
index 7936df2..0000000
--- a/.github/workflows/test.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Test
-
-
-on:
-  push:
-    branches: [ master, main ]
-  pull_request:
-    branches: [ master, main ]
-
-
-jobs:
-  test:
-    name: Test
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-
-      - name: Install Requirements
-        run: pip install .[dev,mouthing,server]
-
-      - name: Test Code
-        run: pytest signwriting