diff --git a/.travis.yml b/.travis.yml
index c61e41702be..97520682ab7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: python
 cache: pip
 dist: xenial
-python: 3.7
+python: 3.8
 addons:
   apt:
     packages:
@@ -38,6 +38,10 @@ jobs:
     - env: GROUP=2
       python: pypy2.7-6.0
     # Other Supported CPython
+    - env: GROUP=1
+      python: 3.7
+    - env: GROUP=2
+      python: 3.7
     - env: GROUP=1
       python: 3.6
     - env: GROUP=2
@@ -47,15 +51,7 @@ jobs:
     - env: GROUP=2
       python: 3.5
 
-    - env: GROUP=1
-      python: 3.8-dev
-    - env: GROUP=2
-      python: 3.8-dev
-
   fast_finish: true
-  # It's okay to fail on the in-development CPython version.
-  allow_failures:
-    - python: 3.8-dev
 
 before_install: tools/travis/setup.sh
 install: travis_retry tools/travis/install.sh
diff --git a/tox.ini b/tox.ini
index eb06dbddaea..30eb193dd3d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,7 +31,7 @@ commands = pytest --timeout 300 --cov=pip --cov-report=term-missing --cov-report
 [testenv:docs]
 # Don't skip install here since pip_sphinxext uses pip's internals.
 deps = -r{toxinidir}/tools/requirements/docs.txt
-basepython = python3.7
+basepython = python3.8
 commands =
     sphinx-build -W -d {envtmpdir}/doctrees/html -b html docs/html docs/build/html
     # Having the conf.py in the docs/html is weird but needed because we