diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 00000000..5340e5ba
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+addopts=--cov-config .coveragerc --cov pywb -v --doctest-module ./pywb/ tests/
diff --git a/setup.py b/setup.py
index 33356739..8ed33dc7 100755
--- a/setup.py
+++ b/setup.py
@@ -25,9 +25,10 @@ class PyTest(TestCommand):
     def run_tests(self):
         import pytest
         import sys
-        cmdline = ' --cov-config .coveragerc --cov pywb'
-        cmdline += ' -v --doctest-module ./pywb/ tests/'
-        errcode = pytest.main(cmdline)
+        # cmdline opts moved to pytest.ini
+        #cmdline = ' --cov-config .coveragerc --cov pywb'
+        #cmdline += ' -v --doctest-module ./pywb/ tests/'
+        errcode = pytest.main('')
         sys.exit(errcode)
 
 setup(