diff --git a/.travis.yml b/.travis.yml
index c58274b..e4d7d75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,20 +9,18 @@ before_install:
 matrix:
   include:
     - python: 2.7
-      env:
-      - TOX_ENV=py27
+      env: TOX_ENV=py27
     - python: 3.4
-      env:
-      - TOX_ENV=py34
+      env: TOX_ENV=py34
     - python: 3.5
-      env:
-      - TOX_ENV=py35
+      env: TOX_ENV=py35
     - python: 3.6
-      env:
-      - TOX_ENV=py36
+      env: TOX_ENV=py36
+    - python: 3.7
+      dist: xenial  # required for Python >= 3.7
+      env: TOX_ENV=py37
     - python: pypy
-      env:
-      - TOX_ENV=pypy
+      env: TOX_ENV=pypy
 install:
   - pip install tox
 script:
diff --git a/tox.ini b/tox.ini
index f86ec4b..1e3ba53 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py34, py35, py36, pypy
+envlist = py27, py34, py35, py36, py37, pypy
 
 [testenv]
 commands = py.test -vv