diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5e4843fd..148933f5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,8 @@ 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.8", "pypy-3.9"]
 
     steps:
       - uses: "actions/checkout@v3"
diff --git a/tests/test_api_jws.py b/tests/test_api_jws.py
index 0a0e2954..23975fa4 100644
--- a/tests/test_api_jws.py
+++ b/tests/test_api_jws.py
@@ -83,7 +83,7 @@ def test_non_object_options_dont_persist(self, jws, payload):
 
     def test_options_must_be_dict(self, jws):
         pytest.raises(TypeError, PyJWS, options=object())
-        pytest.raises(TypeError, PyJWS, options=("something"))
+        pytest.raises((TypeError, ValueError), PyJWS, options=("something"))
 
     def test_encode_decode(self, jws, payload):
         secret = "secret"
@@ -607,7 +607,7 @@ def test_decode_options_must_be_dict(self, jws, payload):
         with pytest.raises(TypeError):
             jws.decode(token, "secret", options=object())
 
-        with pytest.raises(TypeError):
+        with pytest.raises((TypeError, ValueError)):
             jws.decode(token, "secret", options="something")
 
     def test_custom_json_encoder(self, jws, payload):
diff --git a/tox.ini b/tox.ini
index d3664617..74fff6a2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,13 +13,16 @@ python =
     3.8: py38, typing
     3.9: py39
     3.10: py310
+    3.11: py311
+    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