diff --git a/.gitignore b/.gitignore
index aa45f946f..242f50845 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ __pycache__/
 *.so
 
 # Distribution / packaging
+.eggs/
 .Python
 env/
 bin/
@@ -69,3 +70,11 @@ docs/_build/
 #OS
 .DS_Store
 
+# JetBrains
+.idea
+
+# Extra test images installed from pillow-depends/test_images
+Tests/images/README.md
+Tests/images/msp
+Tests/images/picins
+Tests/images/sunraster
diff --git a/.travis/install.sh b/.travis/install.sh
index f546d3d43..cad0e3c32 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -7,12 +7,12 @@ sudo apt-get -qq install libfreetype6-dev liblcms2-dev python-tk\
 			 python-qt4 ghostscript libffi-dev libjpeg-turbo-progs cmake imagemagick\
              libharfbuzz-dev libfribidi-dev
 
-pip install check-manifest
 pip install cffi
+pip install check-manifest
 pip install coverage
 pip install olefile
-pip install pytest
-pip install pytest-cov
+pip install -U pytest
+pip install -U pytest-cov
 pip install pyroma
 pip install test-image-results
 
diff --git a/.travis/script.sh b/.travis/script.sh
index a47307ca5..1473ab079 100755
--- a/.travis/script.sh
+++ b/.travis/script.sh
@@ -6,8 +6,8 @@ coverage erase
 python setup.py clean
 CFLAGS="-coverage" python setup.py build_ext --inplace
 
-coverage run --append --include="PIL/*" selftest.py
-python -m pytest -vx --cov PIL --cov-append --cov-report term Tests
+python selftest.py
+python setup.py test
 pushd /tmp/check-manifest && check-manifest --ignore ".coveragerc,.editorconfig,*.yml,*.yaml,tox.ini" && popd
 
 # Docs
diff --git a/Makefile b/Makefile
index 7310dd1d1..8e60024ae 100644
--- a/Makefile
+++ b/Makefile
@@ -15,12 +15,9 @@ co:
     done
 
 coverage:
-	coverage erase
-	coverage run --parallel-mode --include=PIL/* selftest.py
-	python -m pytest --cov PIL --cov-append --cov-report html Tests
-# Doesn't combine properly before report, writing report instead of displaying invalid report.
+	python selftest.py
+	python setup.py test
 	rm -r htmlcov || true
-	coverage combine
 	coverage report
 
 doc:
diff --git a/appveyor.yml b/appveyor.yml
index d966c88ff..a34d4690a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -74,8 +74,13 @@ build_script:
 
 test_script:
 - cd c:\pillow
-- '%PYTHON%\%PIP_DIR%\pip.exe install nose'
-- '%PYTHON%\%EXECUTABLE% test-installed.py -v -s %TEST_OPTIONS%'
+- '%PYTHON%\%PIP_DIR%\pip.exe install pytest pytest-cov'
+- '%PYTHON%\%EXECUTABLE% -m pytest -vx --cov PIL --cov-append --cov-report term --cov-report xml Tests'
+#- '%PYTHON%\%EXECUTABLE% test-installed.py -v -s %TEST_OPTIONS%' TODO TEST_OPTIONS with pytest?
+
+after_test:
+- pip install codecov
+- codecov --file coverage.xml --name %PYTHON%
 
 matrix:
   fast_finish: true
diff --git a/setup.cfg b/setup.cfg
index 0c9e0fc14..fb2d177d6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,6 @@
+[aliases]
+test=pytest
 [metadata]
 license_file = LICENSE
+[tool:pytest]
+addopts = -vx --cov PIL --cov-append --cov-report term Tests
diff --git a/setup.py b/setup.py
index 9319b7372..61eba2313 100755
--- a/setup.py
+++ b/setup.py
@@ -751,6 +751,9 @@ def debug_build():
     return hasattr(sys, 'gettotalrefcount')
 
 
+needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
+pytest_runner = ['pytest-runner'] if needs_pytest else []
+
 try:
     setup(name=NAME,
           version=PILLOW_VERSION,
@@ -782,7 +785,8 @@ try:
           ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
           include_package_data=True,
           packages=find_packages(),
-          test_suite='nose.collector',
+          setup_requires=pytest_runner,
+          tests_require=['pytest'],
           keywords=["Imaging", ],
           license='Standard PIL License',
           zip_safe=not (debug_build() or PLATFORM_MINGW), )
diff --git a/winbuild/appveyor_install_msys2_deps.sh b/winbuild/appveyor_install_msys2_deps.sh
index 52b814433..b13dc9e98 100644
--- a/winbuild/appveyor_install_msys2_deps.sh
+++ b/winbuild/appveyor_install_msys2_deps.sh
@@ -7,5 +7,5 @@ pacman -S --noconfirm mingw32/mingw-w64-i686-python3 \
 	   mingw32/mingw-w64-i686-python2-setuptools \
 	   mingw-w64-i686-libjpeg-turbo
 
-/mingw32/bin/pip install nose olefile
-/mingw32/bin/pip3 install nose olefile
+/mingw32/bin/pip install pytest pytest-cov olefile
+/mingw32/bin/pip3 install pytest pytest-cov olefile
diff --git a/winbuild/build.py b/winbuild/build.py
index 3d6c6e57f..859a40277 100755
--- a/winbuild/build.py
+++ b/winbuild/build.py
@@ -16,7 +16,7 @@ def setup_vms():
         for arch in ('', X64_EXT):
             ret.append("virtualenv -p c:/Python%s%s/python.exe --clear %s%s%s"
                        % (py, arch, VIRT_BASE, py, arch))
-            ret.append(r"%s%s%s\Scripts\pip.exe install nose" %
+            ret.append(r"%s%s%s\Scripts\pip.exe install pytest pytest-cov" %
                        (VIRT_BASE, py, arch))
     return "\n".join(ret)
 
@@ -76,7 +76,7 @@ def build_one(py_ver, compiler):
     args['executable'] = "python.exe"
     if 'EXECUTABLE' in os.environ:
         args['executable'] = "%EXECUTABLE%"
-        
+
     args['py_ver'] = py_ver
     if '34' in py_ver:
         args['tcl_ver'] = '86'