diff --git a/.travis.yml b/.travis.yml
index 91c45daab..1a8231c0e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,12 @@ python:
 - '3.4'
 - '3.5'
 - '3.6'
+# Enable 3.7 without globally enabling sudo and dist: xenial for other build jobs
+matrix:
+  include:
+    - python: 3.7
+      dist: xenial
+      sudo: true
 env:
   global:
     - CC_TEST_REPORTER_ID=$TRAVIS_CODE_CLIMATE_TOKEN
diff --git a/setup.py b/setup.py
index 5ccaa10f5..2720ec461 100644
--- a/setup.py
+++ b/setup.py
@@ -30,11 +30,11 @@ def getRequires():
     install_requires=getRequires(),
     python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
     classifiers=[
-        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6'
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
     ]
 )
diff --git a/tox.ini b/tox.ini
index 2f35f4872..926a3c9dd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py34, py35, py36
+envlist = py27, py34, py35, py36, py37
 
 [testenv]
 commands = coverage erase
@@ -33,4 +33,9 @@ basepython = python3.5
 [testenv:py36]
 commands = {[testenv]commands}
 deps = {[testenv]deps}
-basepython = python3.6
\ No newline at end of file
+basepython = python3.6
+
+[testenv:py37]
+commands = {[testenv]commands}
+deps = {[testenv]deps}
+basepython = python3.7