diff --git a/.github/workflows/test_linux_3.6.yml b/.github/workflows/test_linux_3.6.yml
index 20398b22..b234c14a 100644
--- a/.github/workflows/test_linux_3.6.yml
+++ b/.github/workflows/test_linux_3.6.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Python Setup
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: 3.6
           architecture: x64
diff --git a/.github/workflows/test_linux_3.7.yml b/.github/workflows/test_linux_3.7.yml
index 5652a626..f6d36405 100644
--- a/.github/workflows/test_linux_3.7.yml
+++ b/.github/workflows/test_linux_3.7.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Python Setup
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: 3.7
           architecture: x64
diff --git a/.github/workflows/test_linux_3.8.yml b/.github/workflows/test_linux_3.8.yml
index a1e2a0e0..8c90d7ac 100644
--- a/.github/workflows/test_linux_3.8.yml
+++ b/.github/workflows/test_linux_3.8.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Python Setup
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: 3.8
           architecture: x64
diff --git a/.github/workflows/test_linux_3.9.yml b/.github/workflows/test_linux_3.9.yml
new file mode 100644
index 00000000..905edb6f
--- /dev/null
+++ b/.github/workflows/test_linux_3.9.yml
@@ -0,0 +1,37 @@
+name: Linux (3.9)
+
+on:
+  push:
+    branches: [ main, dev ]
+  pull_request:
+    branches: [ main, 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 0a99a85a..daaca247 100644
--- a/.github/workflows/test_mac.yml
+++ b/.github/workflows/test_mac.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Python Setup
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: 3.8
           architecture: x64
diff --git a/.github/workflows/test_win.yml b/.github/workflows/test_win.yml
index d79a931e..fd85b4bf 100644
--- a/.github/workflows/test_win.yml
+++ b/.github/workflows/test_win.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Python Setup
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: 3.8
           architecture: x64
diff --git a/README.md b/README.md
index 72ae5824..7eb15b8e 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,12 @@
 # novelWriter
 
+[![flake8](https://github.com/vkbo/novelWriter/workflows/flake8/badge.svg)](https://github.com/vkbo/novelWriter/actions)
 [![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.8)](https://github.com/vkbo/novelWriter/workflows/Windows%20(3.8)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions)
-[![macOS (3.8)](https://github.com/vkbo/novelWriter/workflows/macOS%20(3.8)/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions)  
-[![flake8](https://github.com/vkbo/novelWriter/workflows/flake8/badge.svg)](https://github.com/vkbo/novelWriter/actions)
+[![macOS (3.8)](https://github.com/vkbo/novelWriter/workflows/macOS%20(3.8)/badge.svg?branch=main)](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)