diff --git a/.travis.yml b/.travis.yml
index 5f1d4957..d5e9f8da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,13 @@
 sudo: false
+dist: xenial
 language: python
 python:
   - "2.7"
   - "3.5"
   - "3.6"
-  - "pypy"
-  - "pypy3"
+  - "3.7"
+  - "pypy2.7-6.0"
+  - "pypy3.5-6.0"
   - "nightly"
 env:
   - PACKAGE=fluent.syntax
diff --git a/fluent.runtime/tox.ini b/fluent.runtime/tox.ini
index 960d76d9..db54f7a1 100644
--- a/fluent.runtime/tox.ini
+++ b/fluent.runtime/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py35, py36, pypy, pypy3
+envlist = py27, py35, py36, py37, pypy, pypy3
 skipsdist=True
 
 [testenv]
diff --git a/fluent.syntax/tox.ini b/fluent.syntax/tox.ini
index 08e5a27f..4ee7a4bf 100644
--- a/fluent.syntax/tox.ini
+++ b/fluent.syntax/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py35, py36, pypy, pypy3
+envlist = py27, py35, py36, py37, pypy, pypy3
 skipsdist=True
 
 [testenv]