diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ccec3e05..58d93909 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,22 +14,25 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        python_version: [3.7]
+        python_version: ['3.8']
         include:
-          - os: ubuntu-latest
-            python_version: 3.8
           # Experimental: Python 3.9
           # Works fine, commented out because mostly covered (at least installing/building deps) by the typecheck job
           # See issue: https://github.com/NeuroTechX/eeg-notebooks/issues/50
           #- os: ubuntu-latest
           #  python_version: 3.9
 
+          # Check 3.10 for future-proofing
+          - os: ubuntu-latest
+            python_version: '3.10'
+
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python_version }}
+
     # Not needed if pywinhook is installed from wheels
     #- name: Install swig
     #  if: "startsWith(runner.os, 'windows')"
@@ -37,6 +40,7 @@ jobs:
     #    (New-Object System.Net.WebClient).DownloadFile("http://prdownloads.sourceforge.net/swig/swigwin-4.0.1.zip","swigwin-4.0.1.zip");
     #    Expand-Archive .\swigwin-4.0.1.zip .;
     #    echo "$((Get-Item .).FullName)/swigwin-4.0.1" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
     - name: Install APT dependencies
       if: "startsWith(runner.os, 'Linux')"
       run: |
@@ -52,8 +56,9 @@ jobs:
         python -m pip install --upgrade pip wheel
 
         # Install wxPython wheels since they are distribution-specific and therefore not on PyPI
+        # This could possibly be bumped to 22.04 even.
         # See: https://wxpython.org/pages/downloads/index.html
-        pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-18.04 wxPython
+        pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-20.04 wxPython
 
         pip install .
     - name: Install MacOS/Windows dependencies
@@ -110,7 +115,7 @@ jobs:
 
         # Install wxPython wheels since they are distribution-specific and therefore not on PyPI
         # See: https://wxpython.org/pages/downloads/index.html
-        pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-18.04 wxPython
+        pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-20.04 wxPython
 
         pip install .
     - name: Install MacOS/Windows dependencies