diff --git a/.drone.yml b/.drone.yml
index 2049d30a49..daf5886f3a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -42,12 +42,6 @@ services:
 
 matrix:
     include:
-        - IMAGE: python:3.6
-          TOXENV: py36
-          DATABASE: sqlite
-        - IMAGE: python:3.6
-          TOXENV: py36
-          DATABASE: postgresql
         - IMAGE: python:3.7
           TOXENV: py37
           DATABASE: sqlite
@@ -66,3 +60,9 @@ matrix:
         - IMAGE: python:3.9
           TOXENV: py39
           DATABASE: postgresql
+        - IMAGE: python:3.10
+          TOXENV: py310
+          DATABASE: sqlite
+        - IMAGE: python:3.10
+          TOXENV: py310
+          DATABASE: postgresql
diff --git a/CHANGELOG b/CHANGELOG
index 4982813b2f..78341fa04b 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 ce5e05c1b8..4e7793cd15 100755
--- a/setup.py
+++ b/setup.py
@@ -126,16 +126,16 @@ setup(name=name,
         'Natural Language :: Turkish',
         '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',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business',
         ],
     license='GPL-3',
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     install_requires=requires,
     dependency_links=dependency_links,
     zip_safe=False,
diff --git a/tox.ini b/tox.ini
index c06bf6d49b..fe6ca92445 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py36,py37,py38,py39}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
+envlist = {py37,py38,py39,py310}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
 
 [testenv]
 commands =
@@ -7,9 +7,8 @@ commands =
     coverage report --include=.*/account_dunning_email/* --omit=*/tests/*
 deps =
     coverage
-    {py36,py37,py38,py39}-postgresql: psycopg2 >= 2.5
+    {py37,py38,py39,py310}-postgresql: psycopg2 >= 2.5
     pypy3-postgresql: psycopg2cffi >= 2.5
-    py36-sqlite: sqlitebck
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
     postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}