diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5f71b698f1..20137ef827 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
     name: test (Python ${{ matrix.python-version }})
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11-dev"]
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1dea2b1aff..489427758f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -28,4 +28,4 @@ repos:
     hooks:
       - id: pyupgrade
         args:
-          - --py36-plus
+          - --py37-plus
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 235cd0db41..b256ee320d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -106,7 +106,7 @@ You may also want to investigate `tox` to run tests:
 
 ```
 pip install tox
-tox -epy36
+tox -epy310
 ```
 
 ## Build documentation locally
diff --git a/setup.py b/setup.py
index 0517f02f0f..acd8c328c0 100755
--- a/setup.py
+++ b/setup.py
@@ -96,14 +96,14 @@
             "Operating System :: OS Independent",
             "Programming Language :: Python",
             "Programming Language :: Python :: 3",
-            "Programming Language :: Python :: 3.6",
             "Programming Language :: Python :: 3.7",
             "Programming Language :: Python :: 3.8",
             "Programming Language :: Python :: 3.9",
             "Programming Language :: Python :: 3.10",
+            "Programming Language :: Python :: 3.11",
             "Topic :: Software Development",
         ],
-        python_requires=">=3.6",
+        python_requires=">=3.7",
         install_requires=[
             "deprecated",
             "pyjwt>=2.0",
diff --git a/tox.ini b/tox.ini
index ab2c294832..f4346521c9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,16 +1,16 @@
 [tox]
 envlist =
     lint,
-    py{36,37,38,39,310},
+    py{37,38,39,310,311},
     docs
 
 [gh-actions]
 python =
-    3.6: py36
     3.7: py37
     3.8: py38, docs, lint
     3.9: py39
     3.10: py310
+    3.11: py311
 
 [testenv]
 deps = -rtest-requirements.txt