diff --git a/.drone.yml b/.drone.yml
index b3ce02e151..98820e6bd8 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -39,11 +39,11 @@ services:
 
 matrix:
     include:
-        - IMAGE: python:3.6
-          TOXENV: py36
         - IMAGE: python:3.7
           TOXENV: py37
         - IMAGE: python:3.8
           TOXENV: py38
         - IMAGE: python:3.9
           TOXENV: py39
+        - IMAGE: python:3.10
+          TOXENV: py310
diff --git a/CHANGELOG b/CHANGELOG
index a9eadefa46..4a9153ed47 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+* Add support for Python 3.10
+* Remove support for Python 3.6
+
 Version 6.2.0 - 2021-11-01
 * Bug fixes (see mercurial logs for details)
 
diff --git a/setup.py b/setup.py
index ce1c524c6a..5684d4183d 100755
--- a/setup.py
+++ b/setup.py
@@ -86,15 +86,15 @@ setup(name=name,
         'License :: OSI Approved :: GNU General Public License (GPL)',
         'Operating System :: OS Independent',
         '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',
         'Topic :: Software Development :: Libraries :: Python Modules'
         ],
     platforms='any',
     license='GPL-3',
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     install_requires=requires,
     entry_points={
         'trytond.backend': [
diff --git a/tox.ini b/tox.ini
index e20cfa99d2..2250def535 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py37,py38,py39
+envlist = py37,py38,py39,py310
 
 [testenv]
 commands =