diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 4bae72be..5a313c2e 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -29,6 +29,9 @@ jobs:
                 architecture:
                     - x64
                     - x86
+                include:
+                  - py: "pypy-3.8"
+                    toxenv: "pypy38"
                 exclude:
                     # Linux and macOS don't have x86 python
                     - os: "ubuntu-latest"
@@ -46,8 +49,15 @@ jobs:
                   python-version: ${{ matrix.py }}
                   architecture: ${{ matrix.architecture }}
             - run: pip install tox
-            - name: Running tox
+            - name: Running tox with specific toxenv
+              if: ${{ matrix.toxenv != '' }}
+              env:
+                TOXENV: ${{ matrix.toxenv }}
+              run: tox
+            - name: Running tox for current python version
+              if: ${{ matrix.toxenv == '' }}
               run: tox -e py
+
     coverage:
         runs-on: ubuntu-latest
         name: Validate coverage
diff --git a/tox.ini b/tox.ini
index c1684047..26591874 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
     lint,
-    py37,py38,py39,py310,pypy3,
+    py37,py38,py39,py310,pypy38,
     coverage,
     docs
 isolated_build = True
@@ -10,7 +10,7 @@ isolated_build = True
 commands =
     python --version
     python -mpytest \
-    pypy3: --no-cov \
+    pypy38: --no-cov \
         {posargs:}
 extras =
     testing