diff --git a/.drone.yml b/.drone.yml
index d143b711c3..18d720341f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,3 +23,5 @@ matrix:
           TOXENV: py36
         - IMAGE: tryton/tryton-test:3.7
           TOXENV: py37
+        - IMAGE: tryton/tryton-test:3.8
+          TOXENV: py38
diff --git a/CHANGELOG b/CHANGELOG
index c7af7ca883..06717dc9b1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Add support for Python 3.8
 * Manage readonly dates in calendar view
 * Manage editable on calendar view
 * Manage model access on calendar view
diff --git a/setup.py b/setup.py
index 63a2d60656..03eb07074b 100755
--- a/setup.py
+++ b/setup.py
@@ -130,6 +130,7 @@ dist = setup(name=name,
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Topic :: Office/Business',
         ],
     platforms='any',
diff --git a/tox.ini b/tox.ini
index 9fe832cc37..5528be5df0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py35,py36,py37
+envlist = py35,py36,py37,py38
 
 [testenv]
 commands = {envpython} setup.py test