diff --git a/.travis.yml b/.travis.yml
index d04458d..806ff26 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,10 +35,9 @@ matrix:
       env: TOXENV=pypy3
     - python: pypy
       env: TOXENV=pypy
-    - python: 3.6-dev
-      env: TOXENV=py36dev
-    - python: 3.7-dev
-      env: TOXENV=py37dev
+    - python: 3.8-dev
+      env: TOXENV=py38dev
+      dist: xenial
   allow_failures:
     - env: TOXENV=pypy
     - env: TOXENV=pypy3
diff --git a/tox.ini b/tox.ini
index fd2f908..22cc282 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py37, py36, py35, py34, pypy, pypy3, py36dev, py37dev
+envlist = py27, py37, py36, py35, py34, pypy, pypy3, py38dev
 recreate = False
 
 [testenv]