diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a1b7923..39c2f21 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
       matrix:
         # Not all Python versions are available for linux AND x64
         # https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json
-        python-version: [3.5, 3.6, 3.7, 3.8, 3.9, '3.10']
+        python-version: [3.5, 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']
         extra: ['', '-smtp']
       fail-fast: false
 
diff --git a/setup.py b/setup.py
index ff60555..78f4025 100644
--- a/setup.py
+++ b/setup.py
@@ -53,7 +53,7 @@ def run(self):
     zip_safe=False,
     include_package_data=True,
 
-    keywords='pytest pytest server localhost http smtp',
+    keywords='pytest server localhost http smtp',
     classifiers=[
         'Framework :: Pytest',
         'Operating System :: OS Independent',
diff --git a/tox.ini b/tox.ini
index 68339c3..f21574d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{35,36,37,38,39,310}{,-smtp}
+envlist = py{35,36,37,38,39,310,311,py3}{,-smtp}
 recreate = True
 isolated_build = True