diff --git a/.travis.yml b/.travis.yml
index 143f080d5..889af4c23 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,18 @@
 language: python
-python:
-  - "2.7"
-  - "3.4"
-  - "3.5"
-  - "3.6"
-  - "3.7-dev"
-  - "pypy-5.7.1"
+matrix:
+  include:
+    - python: 2.7
+    - python: 3.4
+    - python: 3.5
+    - python: 3.6
+    - python: 3.7
+      dist: xenial
+      sudo: true
+    - python: pypy2.7-5.10.0
+    - python: pypy3.5-5.10.1
+  allow_failures:
+    - python: pypy2.7-5.10.0
+    - python: pypy3.5-5.10.1
 
 dist: trusty
 sudo: false
diff --git a/appveyor.yml b/appveyor.yml
index fdb97803c..b2aa6e1ce 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,6 +10,7 @@ environment:
     - PYTHON: "C:\\Python34"
     - PYTHON: "C:\\Python35"
     - PYTHON: "C:\\Python36"
+    - PYTHON: "C:\\Python37"
 
 branches:
   only:
diff --git a/setup.py b/setup.py
index 55a0700c7..9cb90b7de 100644
--- a/setup.py
+++ b/setup.py
@@ -56,4 +56,5 @@ with codecs.open('README.rst', 'r', 'utf-8') as fd:
               'Programming Language :: Python :: 3.4',
               'Programming Language :: Python :: 3.5',
               'Programming Language :: Python :: 3.6'
+              'Programming Language :: Python :: 3.7'
           ],)