diff --git a/.drone.yml b/.drone.yml
index b86abd62bd..1e33a514f1 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -32,3 +32,5 @@ matrix:
           TOXENV: py37
         - IMAGE: tryton/tryton-test:3.8
           TOXENV: py38
+        - IMAGE: tryton/tryton-test:3.9
+          TOXENV: py39
diff --git a/CHANGELOG b/CHANGELOG
index 90039ee528..19d4bbc5c6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Add support for Python 3.9
 * Support empty value for timedelta converter
 * Add interactive search on tree view
 * Unify PYSON string format
diff --git a/setup.py b/setup.py
index e3f65fe79b..4e665835c6 100755
--- a/setup.py
+++ b/setup.py
@@ -142,6 +142,7 @@ dist = setup(name=name,
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Topic :: Office/Business',
         ],
     platforms='any',
diff --git a/tox.ini b/tox.ini
index 534a92d719..08a6566d3a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py37,py38
+envlist = py36,py37,py38,py39
 
 [testenv]
 commands = {envpython} setup.py test