diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ee7e638b..8fe9e586 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [2.7, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9]
+        python-version: [2.7, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, pypy2, pypy3]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -17,4 +17,4 @@ jobs:
       - run: pip install tox
       - run: tox
         env:
-          TOXENV: py${{ matrix.python-version }}
\ No newline at end of file
+          TOXENV: ${{ matrix.python-version }}
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 433f7c5b..673e6ccd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist=
-    coveralls, pylint, flake8, pydocstyle, py2.7, py3.4, py3.5, py3.6, py3.7, py3.8, py3.9, pypy, pypy3
+    coveralls, pylint, flake8, pydocstyle, 2.7, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, pypy2, pypy3
 
 [testenv]
 deps=
@@ -31,7 +31,7 @@ commands=
     coverage report --rcfile=./.coveragerc
     coveralls
 
-[testenv:py2.7]
+[testenv:2.7]
 deps=
     unittest2
 extras=
@@ -40,7 +40,7 @@ extras=
 commands=
     unit2 discover -s tests/unit -p test_*_py2_py3.py
 
-[testenv:py3.4]
+[testenv:3.4]
 deps=
     unittest2
 extras=
@@ -48,7 +48,7 @@ extras=
 commands=
     unit2 discover -s tests/unit -p test_*_py3.py
 
-[testenv:py3.5]
+[testenv:3.5]
 deps=
     unittest2
 extras=
@@ -57,7 +57,7 @@ extras=
 commands=
     unit2 discover -s tests/unit -p test_*_py3.py
 
-[testenv:pypy]
+[testenv:pypy2]
 deps=
     unittest2
 extras=