diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e00ef74bb..94788eacb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
           # Meta
           - {VERSION: "3.9", TOXENV: "check-manifest"}
           - {VERSION: "3.9", TOXENV: "flake8"}
-          - {VERSION: "3.6", TOXENV: "py36-mypy", OS: "ubuntu-20.04"}
+          - {VERSION: "3.6", TOXENV: "py311-mypy"}
           - {VERSION: "3.9", TOXENV: "docs"}
     name: "${{ matrix.PYTHON.TOXENV }}${{ matrix.PYTHON.OS && format(' on {0}', matrix.PYTHON.OS) || '' }}"
     steps:
diff --git a/tox.ini b/tox.ini
index 53a5d7021..148d6bc7c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{py,py3,36,37,38,39,310,311}{,-cryptographyMain,-cryptographyMinimum}{,-useWheel}{,-randomorder},py37-twistedTrunk,check-manifest,flake8,py36-mypy,docs,coverage-report
+envlist = py{py,py3,36,37,38,39,310,311}{,-cryptographyMain,-cryptographyMinimum}{,-useWheel}{,-randomorder},py37-twistedTrunk,check-manifest,flake8,py311-mypy,docs,coverage-report
 
 [testenv]
 allowlist_externals =
@@ -52,7 +52,7 @@ commands =
     black --check .
     flake8 .
 
-[testenv:py36-mypy]
+[testenv:py311-mypy]
 deps =
     mypy==1.1.1
 skip_install = true