diff --git a/README.md b/README.md
index 6fbc679e43528bfd1ee066ba393f839c79c05450..bd541aa02a9f787da57e2a5b483ce3d5639caab0 100644
--- a/README.md
+++ b/README.md
@@ -30,8 +30,8 @@ The HTML documentation will be generated and saved in the `doc/html/` directory.
 Tests
 -----
 
-To run the tests, install `pytest` and `coverage`, and then run:
+To run the tests, install `pytest` and `pytest-cov`, and then run:
 
-       python setup.py test --addopts="-v --niters=50 --cov=fsl --cov-report=html"
+       python setup.py test
 
 A code coverage report will be generated in `htmlcov/`.
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 0000000000000000000000000000000000000000..599c0c249814ef8da3a0efca547b52e16dcdb48b
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,3 @@
+[pytest]
+testpaths = tests
+addopts   = -v --niters=50 --cov=fsl --cov-report=html
diff --git a/setup.cfg b/setup.cfg
index 9af7e6f11bb01f7306f796faf7bfbe3e2955cd94..b7e478982ccf9ab1963c74e1084dfccb6e42c583 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,2 @@
 [aliases]
-test=pytest
\ No newline at end of file
+test=pytest
diff --git a/setup.py b/setup.py
index 0d5ba189db431976c1e52c6a18d003fa4f92c735..246320837ffdb49671f62dc46934ec7cf5765dea 100644
--- a/setup.py
+++ b/setup.py
@@ -98,7 +98,7 @@ setup(
     install_requires=install_requires,
 
     setup_requires=['pytest-runner'],
-    tests_require=['pytest', 'pytest-runner'],
+    tests_require=['pytest', 'pytest-cov', 'pytest-runner'],
     test_suite='tests',
 
     cmdclass={'doc' : doc},