diff --git a/.travis.yml b/.travis.yml
index 9ce3e2a..150373b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,87 +1,37 @@
 language: python
-sudo: false
+dist: xenial
 cache: pip
-matrix:
-  include:
-  - env: TOXENV=readme-py27
-    python: 2.7
-  - env: TOXENV=py27-dj111-coverage
-    python: 2.7
-  - env: TOXENV=py35-dj111-coverage
-    python: 3.5
-  - env: TOXENV=py36-dj111-coverage
-    python: 3.6
-  - env: TOXENV=pypy-dj111-coverage
-    python: pypy
-  - env: TOXENV=pypy3-dj111-coverage
-    python: pypy3
-  - env: TOXENV=py35-dj20-coverage
-    python: 3.5
-  - env: TOXENV=py36-dj20-coverage
-    python: 3.6
-  - env: TOXENV=py37-dj20-coverage
-    python: 3.7
-  - env: TOXENV=pypy3-dj20-coverage
-    python: pypy3
-  - env: TOXENV=py36-dj21-coverage
-    python: 3.6
-  - env: TOXENV=py37-dj21-coverage
-    python: 3.7
-  - env: TOXENV=pypy3-dj21-coverage
-    python: pypy3
-  - env: TOXENV=py36-dj22-coverage
-    python: 3.6
-  - env: TOXENV=py37-dj22-coverage
-    python: 3.7
-  - env: TOXENV=py38-dj22-coverage
-    python: 3.8
-  - env: TOXENV=pypy3-dj22-coverage
-    python: pypy3
-  - env: TOXENV=py36-dj30-coverage
-    python: 3.6
-  - env: TOXENV=py37-dj30-coverage
-    python: 3.7
-  - env: TOXENV=py38-dj30-coverage
-    python: 3.8
-  - env: TOXENV=pypy3-dj30-coverage
-    python: pypy3
-  - env: TOXENV=py36-djmaster-coverage
-    python: 3.6
-  - env: TOXENV=py37-djmaster-coverage
-    python: 3.7
-  - env: TOXENV=py38-djmaster-coverage
-    python: 3.8
-  - env: TOXENV=pypy3-djmaster-coverage
-    python: pypy3
-  allow_failures:
-  - env: TOXENV=py36-djmaster-coverage
-    python: 3.6
-  - env: TOXENV=py37-djmaster-coverage
-    python: 3.7
-  - env: TOXENV=py38-djmaster-coverage
-    python: 3.8
-  - env: TOXENV=pypy3-djmaster-coverage
-    python: pypy3
-install:
-- pip install tox
+python:
+- '2.7'
+- '3.5'
+- '3.6'
+- '3.7'
+- '3.8'
+- 'pypy3'
+install: travis_retry pip install tox-travis codecov
 script: tox -v
-after_success:
-- |
-  if [[ "${TOXENV%-coverage}" != "$TOXENV" ]]; then
-    pip install codecov
-    coverage xml
-    codecov --required -X gcov fix pycov -f coverage.xml --flags ${TOXENV//-/ }
-  fi
+after_success: codecov --required -X gcov fix pycov -f coverage.xml --flags ${TOXENV//-/ }
 branches:
   except: templates/1.5.x templates/1.6.x
-deploy:
-  provider: pypi
-  user: jazzband
-  server: https://jazzband.co/projects/django-configurations/upload
-  distributions: sdist bdist_wheel
-  password:
-    secure: LuserSjUTGSsls9zrvck/FbfL+gFpNU/ywOQ/67ufEbbpGCeDBEgxDzgb0acfHNk8wlAkaPvaAejQBFtcUulhdNT/g0NsmaEAjd6HhCGM+FRJAnYFaj33Js6C+N2tX5wznL7uCBxqgtaaH0hf6ucqC8OXqwoCVGgdxAEnUlC/fY=
-  on:
-    tags: true
-    repo: jazzband/django-configurations
-    condition: "$TOXENV = py36-dj111"
+stages:
+- test
+- name: deploy
+  if: repo = jazzband/django-configurations AND tag IS present
+jobs:
+  include:
+  - stage: test
+  - stage: deploy
+    install: skip
+    script: skip
+    python: 3.7
+    env: skip
+    deploy:
+      provider: pypi
+      user: jazzband
+      server: https://jazzband.co/projects/django-configurations/upload
+      distributions: sdist bdist_wheel
+      password:
+        secure: LuserSjUTGSsls9zrvck/FbfL+gFpNU/ywOQ/67ufEbbpGCeDBEgxDzgb0acfHNk8wlAkaPvaAejQBFtcUulhdNT/g0NsmaEAjd6HhCGM+FRJAnYFaj33Js6C+N2tX5wznL7uCBxqgtaaH0hf6ucqC8OXqwoCVGgdxAEnUlC/fY=
+      on:
+        tags: true
+        repo: jazzband/django-configurations
diff --git a/tox.ini b/tox.ini
index e3e1ac1..f817d8b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,20 +5,27 @@ minversion = 1.8
 whitelist_externals = sphinx-build
 envlist =
     checkqa,
-    readme-py27,
+    readme,
     py{27,35,36,py}-dj111
     py{35,36,37,py3}-dj20
     py{35,36,37,py3}-dj21
     py{35,36,37,38,py3}-dj22
     py{36,37,38,py3}-dj{30,master}
 
+[travis]
+python =
+    2.7: py27
+    3.5: py35
+    3.6: py36,flake8,readme
+    3.7: py37
+    3.8: py36
+    pypy3: pypy3
+
 [testenv]
 usedevelop = true
 setenv =
     DJANGO_SETTINGS_MODULE = tests.settings.main
     DJANGO_CONFIGURATION = Test
-    coverage: COVERAGE_PROCESS_START = {toxinidir}/setup.cfg
-    coverage: _TEST_RUN_PREFIX=coverage run
 deps =
     dj111: django>=1.11,<2.0
     dj20: django>=2.0a1,<2.1
@@ -27,16 +34,17 @@ deps =
     dj30: django>=3.0a1,<3.1
     djmaster: https://github.com/django/django/archive/master.tar.gz#egg=django
     py27,pypy: mock
-    coverage: coverage
-    coverage: coverage_enable_subprocess
+    coverage
+    coverage_enable_subprocess
 extras = testing
 commands =
     python --version
-    {env:_TEST_RUN_PREFIX:} {envbindir}/django-cadmin test -v2 {posargs:tests}
-    coverage: coverage combine . tests/docs
-    coverage: coverage report -m --skip-covered
+    {envbindir}/coverage run {envbindir}/django-cadmin test -v2 {posargs:tests}
+    coverage combine . tests/docs
+    coverage report -m --skip-covered
+    coverage xml
 
-[testenv:readme-py27]
+[testenv:readme]
 commands = python setup.py check -r -s
 deps = readme_renderer