diff --git a/pytest.ini b/pytest.ini
deleted file mode 100644
index 590369315..000000000
--- a/pytest.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[pytest]
-markers =
-    fast_test: marks tests as fast (deselect with '-m "not fast_test"')
-    slow_test: marks tests as slow (deselect with '-m "not slow_test"')
-    slow: marks tests as slow (deselect with '-m "not slow"')
-    serial
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 82f184d34..dcc9caad1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,11 +13,17 @@ addopts =
     --ignore maint_tools
     --doctest-modules
     --disable-pytest-warnings
-    -rs
+    -rxXs
 
 filterwarnings =
     ignore:the matrix subclass:PendingDeprecationWarning
 
+markers =
+    fast_test: marks tests as fast (deselect with '-m "not fast_test"')
+    slow_test: marks tests as slow (deselect with '-m "not slow_test"')
+    slow: marks tests as slow (deselect with '-m "not slow"')
+    serial
+
 # used by our travis auto-deployment system
 # needs changing if scikit-optimize ever stops being
 # a pure python module