diff --git a/.travis.yml b/.travis.yml
index 5b3c43ec8c8ba..0a3d710810cf6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,9 +19,14 @@ matrix:
     - python: "3.7"
       env: TOXENV=py37
       dist: xenial
-  # allow_failures:
-  #   - python: "3.5"
-  #     env: TOXENV=typing
+    - python: "3.8-dev"
+      env: TOXENV=py38
+      dist: xenial
+      if: branch = dev AND type = push
+  allow_failures:
+    - python: "3.8-dev"
+      env: TOXENV=py38
+      dist: xenial
 
 cache:
   directories:
diff --git a/tox.ini b/tox.ini
index 578a431febf9c..4ed68fddf3716 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py35, py36, py37, lint, pylint, typing
+envlist = py35, py36, py37, py38, lint, pylint, typing
 skip_missing_interpreters = True
 
 [testenv]