diff --git a/.travis.yml b/.travis.yml
index 2606fd8..8728d6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,11 @@
-dist: xenial
+dist: bionic
 language: python
 python:
 - '2.7'
 - '3.5'
 - '3.6'
 - '3.7'
-- 3.8-dev
+- '3.8'
 install: pip install tox tox-travis coverage codecov
 script: tox --recreate
 branches:
diff --git a/tox.ini b/tox.ini
index 5b1fe94..cf9c2c2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
 distshare = {homedir}/.tox/distshare
-envlist = py37-pytestlatest-linters,
+envlist = py38-pytestlatest-linters,
           py27-pytest{43,44,45,46}-coverage,
-          py37-pytest{43,44,45,46,5,51,latest}-coverage,
+          py38-pytest{43,44,45,46,50,51,52, latest}-coverage,
           py{35,36,38}-pytestlatest-coverage,
           py27-pytestlatest-xdist-coverage
 skip_missing_interpreters = true
@@ -13,8 +13,9 @@ setenv =
     xdist: _PYTEST_MORE_ARGS=-n3 -rfsxX
 deps =
     pytestlatest: pytest
+    pytest52: pytest~=5.2.0
     pytest51: pytest~=5.1.0
-    pytest5: pytest~=5.0.0
+    pytest50: pytest~=5.0.0
     pytest46: pytest~=4.6.0
     pytest45: pytest~=4.5.0
     pytest44: pytest~=4.4.0
@@ -25,6 +26,6 @@ deps =
     -r{toxinidir}/requirements-testing.txt
 commands = {env:_PYTEST_CMD:pytest} {env:_PYTEST_MORE_ARGS:} {posargs:-vvl}
 
-[testenv:py37-pytestlatest-linters]
+[testenv:py38-pytestlatest-linters]
 deps = black
 commands = black --check --verbose setup.py docs pytest_bdd tests