diff --git a/.drone.yml b/.drone.yml
index 4c8beb23de..20508b8b28 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -38,3 +38,5 @@ matrix:
           TOXENV: py36
         - IMAGE: python:3.7
           TOXENV: py37
+        - IMAGE: python:3.8
+          TOXENV: py38
diff --git a/setup.py b/setup.py
index 4c0bed44ce..0d619142a7 100755
--- a/setup.py
+++ b/setup.py
@@ -80,6 +80,7 @@ setup(name=name,
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Topic :: Software Development :: Libraries :: Python Modules'
         ],
     platforms='any',
diff --git a/tox.ini b/tox.ini
index 93ac68b103..8cf647c28d 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