diff --git a/.travis/script.sh b/.travis/script.sh
index 1473ab079..a67b9da3b 100755
--- a/.travis/script.sh
+++ b/.travis/script.sh
@@ -7,7 +7,8 @@ python setup.py clean
 CFLAGS="-coverage" python setup.py build_ext --inplace
 
 python selftest.py
-python setup.py test
+python -m pytest -vx --cov PIL --cov-report term Tests
+
 pushd /tmp/check-manifest && check-manifest --ignore ".coveragerc,.editorconfig,*.yml,*.yaml,tox.ini" && popd
 
 # Docs
diff --git a/Tests/README.rst b/Tests/README.rst
index 68c001fdd..44f6f4792 100644
--- a/Tests/README.rst
+++ b/Tests/README.rst
@@ -33,7 +33,7 @@ Or with coverage::
 
 To run an individual test::
 
-    pytest Tests/test_image.py
+    pytest -k Tests/test_image.py
 
 Run all the tests from the root of the Pillow source distribution::
 
diff --git a/setup.cfg b/setup.cfg
index 4a1338396..8032517f6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,4 +3,4 @@ test=pytest
 [metadata]
 license_file = LICENSE
 [tool:pytest]
-addopts = -vx --cov PIL --cov-report term Tests
+addopts = -vx Tests