diff --git a/.github/workflows/test_linux_3.6.yml b/.github/workflows/test_linux.yml
similarity index 85%
rename from .github/workflows/test_linux_3.6.yml
rename to .github/workflows/test_linux.yml
index a13d7c11..81584457 100644
--- a/.github/workflows/test_linux_3.6.yml
+++ b/.github/workflows/test_linux.yml
@@ -1,4 +1,4 @@
-name: Linux (3.6)
+name: Linux
 
 on:
   push:
@@ -7,13 +7,16 @@ on:
     branches: [ main, testing, dev ]
 
 jobs:
-  testLinux36:
+  testLinux:
+    strategy:
+      matrix:
+        python-version: [3.6, 3.7, 3.8, 3.9]
     runs-on: ubuntu-latest
     steps:
       - name: Python Setup
         uses: actions/setup-python@v2
         with:
-          python-version: 3.6
+          python-version: ${{ matrix.python-version }}
           architecture: x64
       - name: Install Packages
         run: |
diff --git a/.github/workflows/test_linux_3.7.yml b/.github/workflows/test_linux_3.7.yml
deleted file mode 100644
index 1b323b9c..00000000
--- a/.github/workflows/test_linux_3.7.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: Linux (3.7)
-
-on:
-  push:
-    branches: [ main, testing, dev ]
-  pull_request:
-    branches: [ main, testing, dev ]
-
-jobs:
-  testLinux37:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Python Setup
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.7
-          architecture: x64
-      - name: Install Packages
-        run: |
-          sudo apt update
-          sudo apt install libenchant-dev qt5-default
-      - name: Checkout Source
-        uses: actions/checkout@v2
-      - name: Install Dependencies
-        run: |
-          pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install pytest-timeout
-          pip install pytest-cov
-          pip install pytest-qt
-          pip install codecov
-      - name: Run Tests
-        run: |
-          export QT_QPA_PLATFORM=offscreen
-          pytest -v --cov=nw --timeout=60
-      - name: Upload to Codecov
-        uses: codecov/codecov-action@v1
diff --git a/.github/workflows/test_linux_3.8.yml b/.github/workflows/test_linux_3.8.yml
deleted file mode 100644
index cb1bc8c4..00000000
--- a/.github/workflows/test_linux_3.8.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: Linux (3.8)
-
-on:
-  push:
-    branches: [ main, testing, dev ]
-  pull_request:
-    branches: [ main, testing, dev ]
-
-jobs:
-  testLinux38:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Python Setup
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
-          architecture: x64
-      - name: Install Packages
-        run: |
-          sudo apt update
-          sudo apt install libenchant-dev qt5-default
-      - name: Checkout Source
-        uses: actions/checkout@v2
-      - name: Install Dependencies
-        run: |
-          pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install pytest-timeout
-          pip install pytest-cov
-          pip install pytest-qt
-          pip install codecov
-      - name: Run Tests
-        run: |
-          export QT_QPA_PLATFORM=offscreen
-          pytest -v --cov=nw --timeout=60
-      - name: Upload to Codecov
-        uses: codecov/codecov-action@v1
diff --git a/.github/workflows/test_linux_3.9.yml b/.github/workflows/test_linux_3.9.yml
deleted file mode 100644
index 433596db..00000000
--- a/.github/workflows/test_linux_3.9.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: Linux (3.9)
-
-on:
-  push:
-    branches: [ main, testing, dev ]
-  pull_request:
-    branches: [ main, testing, dev ]
-
-jobs:
-  testLinux39:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Python Setup
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.9
-          architecture: x64
-      - name: Install Packages
-        run: |
-          sudo apt update
-          sudo apt install libenchant-dev qt5-default
-      - name: Checkout Source
-        uses: actions/checkout@v2
-      - name: Install Dependencies
-        run: |
-          pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install pytest-timeout
-          pip install pytest-cov
-          pip install pytest-qt
-          pip install codecov
-      - name: Run Tests
-        run: |
-          export QT_QPA_PLATFORM=offscreen
-          pytest -v --cov=nw --timeout=60
-      - name: Upload to Codecov
-        uses: codecov/codecov-action@v1
diff --git a/.github/workflows/test_mac.yml b/.github/workflows/test_mac.yml
index 54811cc6..1855e4cd 100644
--- a/.github/workflows/test_mac.yml
+++ b/.github/workflows/test_mac.yml
@@ -1,4 +1,4 @@
-name: macOS (3.9)
+name: macOS
 
 on:
   push:
@@ -7,7 +7,7 @@ on:
     branches: [ main, testing, dev ]
 
 jobs:
-  testMac39:
+  testMac:
     runs-on: macos-latest
     steps:
       - name: Python Setup
diff --git a/.github/workflows/test_win.yml b/.github/workflows/test_win.yml
index 496485c6..2c016d4d 100644
--- a/.github/workflows/test_win.yml
+++ b/.github/workflows/test_win.yml
@@ -1,4 +1,4 @@
-name: Windows (3.9)
+name: Windows
 
 on:
   push:
@@ -7,7 +7,7 @@ on:
     branches: [ main, testing, dev ]
 
 jobs:
-  testWin39:
+  testWin:
     runs-on: windows-latest
     steps:
       - name: Python Setup
diff --git a/README.md b/README.md
index 29434c87..c5d87907 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,12 @@
 # novelWriter
 
-[![Linux (3.6)](https://github.com/vkbo/novelWriter/workflows/Linux%20(3.6)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions)
-[![Linux (3.7)](https://github.com/vkbo/novelWriter/workflows/Linux%20(3.7)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions)
-[![Linux (3.8)](https://github.com/vkbo/novelWriter/workflows/Linux%20(3.8)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions)
-[![Linux (3.9)](https://github.com/vkbo/novelWriter/workflows/Linux%20(3.9)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions)
-[![Windows (3.9)](https://github.com/vkbo/novelWriter/workflows/Windows%20(3.9)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions)
-[![macOS (3.9)](https://github.com/vkbo/novelWriter/workflows/macOS%20(3.9)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions)
+[![Linux](https://github.com/vkbo/novelWriter/actions/workflows/test_linux.yml/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions/workflows/test_linux.yml)
+[![Windows](https://github.com/vkbo/novelWriter/actions/workflows/test_win.yml/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions/workflows/test_win.yml)
+[![macOS](https://github.com/vkbo/novelWriter/actions/workflows/test_mac.yml/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions/workflows/test_mac.yml)
 [![flake8](https://github.com/vkbo/novelWriter/workflows/flake8/badge.svg)](https://github.com/vkbo/novelWriter/actions)
 [![codecov](https://codecov.io/gh/vkbo/novelWriter/branch/main/graph/badge.svg)](https://codecov.io/gh/vkbo/novelWriter)
 [![docs](https://readthedocs.org/projects/novelwriter/badge/?version=latest)](https://novelwriter.readthedocs.io/en/latest/?badge=latest)
+
 [![release](https://img.shields.io/github/v/release/vkbo/novelwriter)](https://github.com/vkbo/novelWriter/releases)
 [![pypi](https://img.shields.io/pypi/v/novelwriter)](https://pypi.org/project/novelWriter)
 [![python](https://img.shields.io/pypi/pyversions/novelwriter)](https://pypi.org/project/novelWriter)