diff --git a/appveyor-integration-test.yml b/appveyor-integration-test.yml
index 68c4ee7a9e..1e7b9add98 100644
--- a/appveyor-integration-test.yml
+++ b/appveyor-integration-test.yml
@@ -3,12 +3,14 @@ image: Ubuntu
 
 environment:
   matrix:
-  - TOXENV: py36
-    PYTHON_VERSION: '3.6'
   - TOXENV: py37
     PYTHON_VERSION: '3.7'
   - TOXENV: py38
     PYTHON_VERSION: '3.8'
+  - TOXENV: py39
+    PYTHON_VERSION: '3.9'
+  - TOXENV: py310
+    PYTHON_VERSION: '3.10'
 
 build: off
 
diff --git a/appveyor.yml b/appveyor.yml
index 1552fc748b..8373ed87f1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,12 +3,14 @@ image: Ubuntu
 
 environment:
   matrix:
-  - TOXENV: py36
-    PYTHON_VERSION: '3.6'
   - TOXENV: py37
     PYTHON_VERSION: '3.7'
   - TOXENV: py38
     PYTHON_VERSION: '3.8'
+  - TOXENV: py39
+    PYTHON_VERSION: '3.9'
+  - TOXENV: py310
+    PYTHON_VERSION: '3.10'
 
 build: off
 
diff --git a/setup.py b/setup.py
index 2d304b1a44..7c4fcd876b 100755
--- a/setup.py
+++ b/setup.py
@@ -66,6 +66,7 @@ def read_requirements(req="base.txt"):
         "NOTICE",
         "THIRD_PARTY_LICENSES",
     ),
+    python_requires=">=3.7, <=4.0, !=4.0",
     install_requires=read_requirements("base.txt"),
     include_package_data=True,
     extras_require={"dev": read_requirements("dev.txt")},
@@ -79,9 +80,10 @@ def read_requirements(req="base.txt"):
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
-        "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",
         "Topic :: Internet",
         "Topic :: Software Development :: Build Tools",
         "Topic :: Utilities",
diff --git a/tox.ini b/tox.ini
index 1c3e6577ed..5cb1bcce64 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py36, py37, py38
+envlist = py37, py38, py39, py310
 
 [testenv]
 commands = make pr