diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7355e76..c195075 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -26,6 +26,7 @@ jobs:
       run:  pip install tox
     - name: Unit tests and coverage
       run: |
+        pyver=`echo ${{ matrix.python-version }} | tr -d "."`
         tox -e py${{ matrix.python-version }}
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v1
diff --git a/tox.ini b/tox.ini
index f680bf2..bb11c9c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = check-copyright, black-check, isort-check, docs, flake8, mypy, py3.8, py3.7
+envlist = check-copyright, black-check, isort-check, docs, flake8, mypy, py3{7,8,9,10}
 
 [testenv]
 setenv =
@@ -19,11 +19,9 @@ commands =
         --cov-report=html \
         --cov-report=term
 
-[testenv:py3.7]
-basepython = python3.7
-
-[testenv:py3.8]
-basepython = python3.8
+[testenv:py{37,38,39,310}]
+commands =
+    {[testenv]commands}
 
 [testenv:flake8]
 skip_install = True