diff --git a/.drone.yml b/.drone.yml
index 5da6083eb7..f0b8f55b80 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -43,3 +43,9 @@ matrix:
         - IMAGE: python:3.6
           TOXENV: py36
           DATABASE: postgresql
+        - IMAGE: python:3.7
+          TOXENV: py37
+          DATABASE: sqlite
+        - IMAGE: python:3.7
+          TOXENV: py37
+          DATABASE: postgresql
diff --git a/setup.py b/setup.py
index 78f7e583ea..81607aa2d2 100644
--- a/setup.py
+++ b/setup.py
@@ -87,6 +87,7 @@ setup(name=name,
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business :: Financial :: Accounting',
diff --git a/tox.ini b/tox.ini
index adbcbf8431..546050449f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
-envlist = {py34,py35,py36}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
+envlist = {py34,py35,py36,py37}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
 
 [testenv]
 commands = {envpython} setup.py test
 deps =
-    {py34,py35,py36}-postgresql: psycopg2 >= 2.5
+    {py34,py35,py36,py37}-postgresql: psycopg2 >= 2.5
     pypy3-postgresql: psycopg2cffi >= 2.5
     sqlite: sqlitebck
 setenv =