diff --git a/.coveragerc b/.coveragerc
index 318dad712..31efa91f2 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -2,5 +2,6 @@
 parallel = true
 source = .
 branch = true
+data_file = .coverage.eager
 [report]
 include = pytest_django/*,pytest_django_test/*,tests/*
diff --git a/.travis.yml b/.travis.yml
index 627305e83..55a55a1aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,61 +7,8 @@ jobs:
   include:
     # py37 is not available in trusty dist, and requires sudo=true with xenial.
     - stage: test
-      python: 3.7
-      env: TOXENV=py37-dj21-sqlite
-      dist: xenial
-      sudo: true
-
-    - python: 3.6
-      env: TOXENV=py36-djmaster-sqlite
-    - python: 3.6
-      env: TOXENV=py36-dj20-postgres
-    - python: 3.6
-      env: TOXENV=py36-dj111-sqlite
-
-    - python: 3.5
-      env: TOXENV=py35-dj110-postgres
-
-    - python: 3.4
-      env: TOXENV=py34-dj19-sqlite_file
-
-    - python: 2.7
-      env: TOXENV=py27-dj111-mysql_innodb
-    - python: 2.7
-      env: TOXENV=py27-dj111-mysql_myisam
-    - python: 2.7
-      env: TOXENV=py27-dj18-postgres
-
-    # pypy/pypy3: not included with coverage reports (much slower then).
-    - python: pypy
-      env: TOXENV=pypy-dj111-sqlite_file SKIP_COVERAGE=1
-    - python: pypy3
-      env: TOXENV=pypy3-dj110-sqlite SKIP_COVERAGE=1
-
-    - python: 3.6
-      env: TOXENV=checkqa,docs SKIP_COVERAGE=1
-
-    - stage: test_release
       python: 3.6
-      env: TOXENV=py36-dj20-postgres SKIP_COVERAGE=1
-
-    - stage: release
-      script: skip
-      install: skip
-      after_success: true
-      deploy:
-        provider: pypi
-        user: blueyed
-        password:
-          secure: "FY7qbX/N0XRcH8hVk00SsQWvNIkuxKvY7Br4ghRnHvleHG3YulJ7WbJnik+9eoBGeMfJeNyzBfVjpeo1ZIq9IZBiyTdNfG/sZFsC5LOoG/CPxPH3nD9JktI2HoBMnlSbGg/MMHjY+wXuOY647U/3qNedcnQmGztYt6QWi5DRxu8="
-        on:
-          tags: true
-        distributions: "sdist bdist_wheel"
-
-  # NOTE: does not show up in "allowed failures" section, but is allowed to
-  # fail (for the "test" stage).
-  allow_failures:
-    - env: TOXENV=py36-djmaster-sqlite
+      env: TOXENV=py36-dj21-sqlite
 
 stages:
   - name: test
@@ -77,8 +24,8 @@ install:
     # Setup coverage tracking.
     if [[ "$SKIP_COVERAGE" != "1" ]]; then
       PYTEST_DJANGO_COVERAGE=1
-      export PYTEST_ADDOPTS='--cov=pytest_django --cov=tests --cov=pytest_django_test --cov-report=term-missing:skip-covered'
-      export _PYTESTDJANGO_TOX_EXTRA_DEPS='pytest-cov==2.5.1'
+      export PYTEST_ADDOPTS='-x --cov-branch --cov=pytest_django --cov=tests --cov=pytest_django_test --cov-report=term-missing:skip-covered'
+      export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/blueyed/pytest-cov/archive/23c7759.tar.gz'
     else
       PYTEST_DJANGO_COVERAGE=0
     fi