diff --git a/.drone.yml b/.drone.yml
index e5941117f0..2049d30a49 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -60,3 +60,9 @@ matrix:
         - IMAGE: python:3.8
           TOXENV: py38
           DATABASE: postgresql
+        - IMAGE: python:3.9
+          TOXENV: py39
+          DATABASE: sqlite
+        - IMAGE: python:3.9
+          TOXENV: py39
+          DATABASE: postgresql
diff --git a/setup.py b/setup.py
index 15a1602d83..4e02074435 100755
--- a/setup.py
+++ b/setup.py
@@ -128,6 +128,7 @@ setup(name=name,
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business',
diff --git a/tox.ini b/tox.ini
index 9597acb907..197496c0cb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
-envlist = {py36,py37,py38}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
+envlist = {py36,py37,py38,py39}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
 
 [testenv]
 commands = {envpython} setup.py test
 deps =
-    {py36,py37,py38}-postgresql: psycopg2 >= 2.5
+    {py36,py37,py38,py39}-postgresql: psycopg2 >= 2.5
     pypy3-postgresql: psycopg2cffi >= 2.5
     py36-sqlite: sqlitebck
 setenv =