diff --git a/setup.cfg b/setup.cfg
index 434b1fd258..5533437121 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -41,6 +41,11 @@ universal=1
 [tool:pytest]
 addopts = -rsx -v --durations=10
 minversion = 3.2
+markers =
+    slow: marks tests as slow (deselect with '-m "not slow"')
+    avoid_travis: marks tests as flaky on TravisCI.
+    ipython: mark a test as exercising IPython
+
 # filterwarnings =
 #     error
 #     ignore::UserWarning