diff --git a/.travis.yml b/.travis.yml
index ef64928..2c573cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,11 @@ python:
   - 3.4
   - 3.5
   - 3.6
-#  - pypy
+matrix:
+  include:
+    - python: 3.7
+      dist: xenial
+      sudo: true
 before_install:
   - pip install --upgrade pip setuptools wheel
 install:
diff --git a/appveyor.yml b/appveyor.yml
index f7d347b..8b3fa89 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,6 +4,7 @@ environment:
     - PYTHON: "C:\\Python34"
     - PYTHON: "C:\\Python35"
     - PYTHON: "C:\\Python36"
+    - PYTHON: "C:\\Python37"
 
 install:
   - SET "PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
diff --git a/setup.py b/setup.py
index fdca27c..ac08f61 100644
--- a/setup.py
+++ b/setup.py
@@ -49,5 +49,6 @@ def get_version():
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
     ],
 )
diff --git a/tox.ini b/tox.ini
index 21bb7a0..798e98e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion=2.6.0
-envlist = py27,py34,py35,py36
+envlist = py27,py34,py35,py36,py37
 skip_missing_interpreters = True
 
 [testenv]