diff --git a/.drone.yml b/.drone.yml
index a20a277240..8a03174e19 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -28,3 +28,5 @@ matrix:
           TOXENV: py35
         - IMAGE: python:3.6
           TOXENV: py36
+        - IMAGE: python:3.7
+          TOXENV: py37
diff --git a/CHANGELOG b/CHANGELOG
index f701781629..82ea9a6c83 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Add support for Python 3.7
 * Remove support for Python 2.7
 
 Version 4.8.0 - 2018-06-01
diff --git a/setup.py b/setup.py
index 9f1d2706d0..057469517b 100644
--- a/setup.py
+++ b/setup.py
@@ -67,6 +67,7 @@ setup(name=name,
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Software Development :: Libraries :: Python Modules'
         ],
     platforms='any',
diff --git a/tox.ini b/tox.ini
index 7118c07919..90439e20e5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py34,py35,py36
+envlist = py34,py35,py36,py37
 
 [testenv]
 commands = {envpython} setup.py test