diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5e4843fde..0a5974016 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,10 @@ jobs:
     strategy:
       matrix:
         platform: ["ubuntu-latest", "windows-latest"]
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10",
+                         "3.11.0-beta - 3.11", "pypy-3.7", "pypy-3.8",
+                         "pypy-3.9"]
+      fail-fast: false  # TODO testing hack
 
     steps:
       - uses: "actions/checkout@v3"
diff --git a/tox.ini b/tox.ini
index d36646177..39e6733e2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,13 +13,17 @@ python =
     3.8: py38, typing
     3.9: py39
     3.10: py310
+    3.11: py311
+    pypy-3.7: pypy3
+    pypy-3.8: pypy3
+    pypy-3.9: pypy3
 
 
 [tox]
 envlist =
     lint
     typing
-    py{36,37,38,39}-{crypto,nocrypto}
+    py{36,37,38,39,310,311,py3}-{crypto,nocrypto}
     docs
     pypi-description
     coverage-report