diff --git a/.travis.yml b/.travis.yml
index fcd2ec14..14b05765 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,20 @@ language: python
 python:
   - 3.5
   - 3.6
-  - 3.7-dev
+
+.mixins:
+- &_xenial
+  dist: xenial
+  sudo: required
+jobs:
+  fast_finish: true
+  include:
+  - python: 3.7
+    <<: *_xenial
+  - python: 3.8-dev
+    <<: *_xenial
+  - python: nightly
+    <<: *_xenial
 
 
 env:
diff --git a/appveyor.yml b/appveyor.yml
index b13c9279..ceb8c480 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,6 +8,8 @@ environment:
     - PYTHON: "C:\\Python35-x64"
     - PYTHON: "C:\\Python36"
     - PYTHON: "C:\\Python36-x64"
+    - PYTHON: "C:\\Python37"
+    - PYTHON: "C:\\Python37-x64"
 
 install:
   - "build.cmd %PYTHON%\\python.exe -m pip install -U setuptools wheel twine codecov"