diff --git a/tox.ini b/tox.ini
index 61912212..37010636 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,13 +38,22 @@ commands = coverage run -m pytest {posargs:-n auto}
 
 [testenv:py310]
 extras = cov
+setenv =
+    PYTHONWARNINGS=d
+    {[testenv:py36]setenv}
+commands = {[testenv:py36]commands}
+
+
+[testenv:py311]
+extras = cov
 # Python 3.6+ has a number of compile-time warnings on invalid string escapes.
 # PYTHONWARNINGS=d and --no-compile below make them visible during the Tox run.
 install_command = python -m pip install --no-compile {opts} {packages}
 setenv =
     PYTHONWARNINGS=d
     {[testenv:py36]setenv}
-commands = {[testenv:py36]commands}
+# xdist is currently broken on 3.11rc2
+commands = coverage run -m pytest {posargs}
 
 
 [testenv:coverage-report]