diff --git a/.travis.yml b/.travis.yml
index 7def417b4..6b61060e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,6 +39,6 @@ install:
   - if [ $PARSER = "lxml" ]; then pip install lxml; fi
   - pip install coveralls
 
-script: python setup.py test -a "--cov subliminal --verbose $PYTEST_ADDOPTS"
+script: python setup.py test --addopts "--cov subliminal --verbose $PYTEST_ADDOPTS"
 
 after_success: coveralls
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 000000000..592e17999
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,11 @@
+[pytest]
+norecursedirs = build dist env .tox .eggs
+addopts = --pep8 --flakes --doctest-glob='*.rst'
+pep8maxlinelength = 120
+pep8ignore =
+    docs/conf.py ALL
+    subliminal/__init__.py E402
+flakes-ignore =
+    docs/conf.py ALL
+    subliminal/__init__.py UnusedImport
+doctest_optionflags= NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL
diff --git a/setup.cfg b/setup.cfg
index afec952ba..ef0247cb9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,15 +8,3 @@ all_files  = 1
 
 [upload_sphinx]
 upload-dir = docs/_build/html
-
-[pytest]
-norecursedirs = build dist env .tox .eggs
-addopts = --pep8 --flakes --doctest-glob='*.rst'
-pep8maxlinelength = 120
-pep8ignore =
-    docs/conf.py ALL
-    subliminal/__init__.py E402
-flakes-ignore =
-    docs/conf.py ALL
-    subliminal/__init__.py UnusedImport
-doctest_optionflags= NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL
diff --git a/setup.py b/setup.py
index 63b40f20c..0223017c2 100644
--- a/setup.py
+++ b/setup.py
@@ -83,5 +83,4 @@
       extras_require={
           'test': test_requirements,
           'dev': dev_requirements
-      },
-      cmdclass={'test': PyTest})
+      })