diff --git a/.github/workflows/lint+test.yml b/.github/workflows/lint+test.yml
index 58b253b..9c1c4a1 100644
--- a/.github/workflows/lint+test.yml
+++ b/.github/workflows/lint+test.yml
@@ -11,81 +11,11 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        python-version:
-          - '2.7'
-          # - '3.4'
-          - '3.5'
-          - '3.6'
-          - '3.7'
-          - '3.8'
-          - '3.9'
-          - '3.10'
-          - 'pypy-2.7'
-          # - 'pypy-3.4'
-          # - 'pypy-3.5'
-          - 'pypy-3.6'
-          - 'pypy-3.7'
-          - 'pypy-3.8'
-          # - 'pypy-3.9'
-          # - 'pypy-3.10'
-        architecture:
-          - 'x86'
-          - 'x64'
-        # Some versions lack specific architecture on Linux on GH Actions
-        exclude:
-          - python-version: '2.7'
-            architecture: 'x86'
-          - python-version: 'pypy-2.7'
-            architecture: 'x86'
-          # - python-version: '3.4'
-          #   architecture: 'x86'
-          # - python-version: '3.4'
-          #   architecture: 'x64'
-          # - python-version: 'pypy-3.4'
-          #   architecture: 'x86'
-          # - python-version: 'pypy-3.4'
-          #   architecture: 'x64'
-          - python-version: '3.5'
-            architecture: 'x86'
-          # - python-version: 'pypy-3.5'
-          #   architecture: 'x86'
-          # - python-version: 'pypy-3.5'
-          #   architecture: 'x64'
-          - python-version: '3.6'
-            architecture: 'x86'
-          - python-version: 'pypy-3.6'
-            architecture: 'x86'
-          - python-version: '3.7'
-            architecture: 'x86'
-          - python-version: 'pypy-3.7'
-            architecture: 'x86'
-          - python-version: '3.8'
-            architecture: 'x86'
-          - python-version: 'pypy-3.8'
-            architecture: 'x86'
-          - python-version: '3.9'
-            architecture: 'x86'
-          # - python-version: 'pypy-3.9'
-          #   architecture: 'x86'
-          # - python-version: 'pypy-3.9'
-          #   architecture: 'x64'
-          - python-version: '3.10'
-            architecture: 'x86'
-          # - python-version: 'pypy-3.10'
-          #   architecture: 'x86'
-          # - python-version: 'pypy-3.10'
-          #   architecture: 'x64'
-
-    name: Python ${{ matrix.python-version }} ${{ matrix.architecture }}
     steps:
-      - uses: actions/checkout@v2
-      - name: Setup python matrix
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
         with:
-          python-version: ${{ matrix.python-version }}
-          architecture: ${{ matrix.architecture }}
+          python-version: '3.12'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
diff --git a/.github/workflows/matrixtest.yml b/.github/workflows/matrixtest.yml
new file mode 100644
index 0000000..d27b487
--- /dev/null
+++ b/.github/workflows/matrixtest.yml
@@ -0,0 +1,47 @@
+name: Run lint and tests
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  matrix-test:
+    strategy:
+      matrix:
+        python-version:
+          - '2.7'
+          # - '3.4'
+          # - '3.5'
+          # - '3.6'
+          - '3.7'
+          - '3.8'
+          - '3.9'
+          - '3.10'
+          - '3.11'
+          # - 'pypy-3.4'
+          # - 'pypy-3.5'
+          - 'pypy-3.6'
+          - 'pypy-3.7'
+          - 'pypy-3.8'
+          - 'pypy-3.9'
+          - 'pypy-3.10'
+          # - 'pypy-3.11'
+          # - 'pypy-3.12'
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: LizardByte/setup-python-action@master
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -e .[dev]
+          pip install pytest
+      - name: Test
+        run:
+          python -m pytest