diff --git a/.travis.yml b/.travis.yml
index f1fe56b3c..b7ec51372 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,9 @@ python:
   - "3.4"
   - "3.5"
   - "3.6"
+  - "3.7"
 cache: pip
-dist: trusty
-sudo: false
+dist: xenial
 # command to install dependencies
 install:
   - pip install -U tox-travis setuptools codecov
@@ -27,4 +27,4 @@ deploy:
     script: .github/deploy.sh
     on:
       branch: master
-      python: 3.6
+      python: 3.7
diff --git a/Jenkinsfile b/Jenkinsfile
index 21c456189..d758f0bcd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,6 @@
 def pys = [
-    [name: 'Python 3.6', docker:'python:3.6-stretch', tox:'py36,flake8', main: true],
+    [name: 'Python 3.7', docker:'python:3.7-stretch', tox:'py37,flake8', main: true],
+    [name: 'Python 3.6', docker:'python:3.6-stretch', tox:'py36', main: false],
     [name: 'Python 3.5', docker:'python:3.5-jessie', tox:'py35', main: false],
     [name: 'Python 2.7', docker:'python:2.7-stretch', tox:'py27', main: false]
 ]
diff --git a/setup.cfg b/setup.cfg
index a589d6a88..60252e93f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,6 +22,7 @@ classifier =
     Programming Language :: Python :: 3.4
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
     Operating System :: OS Independent
 
 [files]
diff --git a/tox.ini b/tox.ini
index 95bfdef76..875e17264 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34, py35, py36, flake8
+envlist = py27, py34, py35, py36, py37, flake8
 
 [testenv]
 commands =