diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index 32cdf450..378f5038 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -9,7 +9,7 @@ jobs:
       max-parallel: 4
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9, pypy3]
+        python-version: [3.6, 3.7, 3.8, 3.9, '3.10', pypy3]
         include:
           - python-version: 3.6
             tox-env: py36
@@ -19,6 +19,8 @@ jobs:
             tox-env: py38
           - python-version: 3.9
             tox-env: py39
+          - python-version: '3.10'
+            tox-env: py310
           - python-version: pypy3
             tox-env: pypy3
     env:
diff --git a/requirements/project-min.txt b/requirements/project-min.txt
index dc70a2dc..cc104160 100644
--- a/requirements/project-min.txt
+++ b/requirements/project-min.txt
@@ -1,6 +1,6 @@
 babel==2.9.0
 click==3.3
-Jinja2==2.10.1
+Jinja2==2.10.2
 Markdown==3.2.1
 PyYAML==5.1
 watchdog==2.0.0
diff --git a/requirements/project.txt b/requirements/project.txt
index 6cd5295b..09e605d7 100644
--- a/requirements/project.txt
+++ b/requirements/project.txt
@@ -1,6 +1,6 @@
 babel>=2.9.0
 click>=7.0
-Jinja2>=2.10.3
+Jinja2>=2.10.2
 Markdown>=3.2.1
 PyYAML>=5.2
 watchdog>=2.0.0
diff --git a/setup.py b/setup.py
index e913eb1e..bc78bb3d 100755
--- a/setup.py
+++ b/setup.py
@@ -60,7 +60,7 @@ setup(
     include_package_data=True,
     install_requires=[
         'click>=3.3',
-        'Jinja2>=2.10.1',
+        'Jinja2>=2.10.2',
         'Markdown>=3.2.1',
         'PyYAML>=3.10',
         'watchdog>=2.0',
@@ -97,6 +97,7 @@ setup(
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3 :: Only',
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
diff --git a/tox.ini b/tox.ini
index ad890b63..51fc3daa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,20 +1,20 @@
 [tox]
 envlist =
-    py{36,37,38,39,py3}-{unittests,min-req,integration,integration-no-babel},
+    py{36,37,38,39,310,py3}-{unittests,min-req,integration,integration-no-babel},
     flake8, markdown-lint, linkchecker, jshint, csslint, nobabel, codespell
 
 [testenv]
 passenv = LANG
 deps=
-    py{36,37,38,39,py3}-{unittests,integration}: -rrequirements/project.txt
-    py{36,37,38,39,py3}-min-req: -rrequirements/project-min.txt
-    py{36,37,38,39,py3}-{unittests,min-req}: -rrequirements/test.txt
+    py{36,37,38,39,310,py3}-{unittests,integration}: -rrequirements/project.txt
+    py{36,37,38,39,310,py3}-min-req: -rrequirements/project-min.txt
+    py{36,37,38,39,310,py3}-{unittests,min-req}: -rrequirements/test.txt
 commands=
     {envpython} --version
-    py{36,37,38,39,py3}-{unittests,min-req}:  {envbindir}/coverage run --source=mkdocs --omit 'mkdocs/tests/*' -m unittest discover -p '*tests.py' mkdocs
-    py{36,37,38,39,py3}-unittests: {envbindir}/coverage xml
-    py{36,37,38,39,py3}-unittests: {envbindir}/coverage report --show-missing
-    py{36,37,38,39,py3}-integration: {envpython} -m mkdocs.tests.integration --output={envtmpdir}/builds
+    py{36,37,38,39,310,py3}-{unittests,min-req}:  {envbindir}/coverage run --source=mkdocs --omit 'mkdocs/tests/*' -m unittest discover -p '*tests.py' mkdocs
+    py{36,37,38,39,310,py3}-unittests: {envbindir}/coverage xml
+    py{36,37,38,39,310,py3}-unittests: {envbindir}/coverage report --show-missing
+    py{36,37,38,39,310,py3}-integration: {envpython} -m mkdocs.tests.integration --output={envtmpdir}/builds
 
 [testenv:flake8]
 deps=-rrequirements/test.txt
@@ -56,7 +56,7 @@ whitelist_externals = csslint
 passenv=*
 commands=csslint mkdocs/
 
-[testenv:py{36,37,38,39,py3}-integration-no-babel]
+[testenv:py{36,37,38,39,310,py3}-integration-no-babel]
 passenv = LANG
 deps=-rrequirements/project.txt
 commands=