diff --git a/setup.cfg b/setup.cfg
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,15 +1,25 @@
 [egg_info]
-tag_build = 
+tag_build =
 tag_svn_revision = 0
 tag_date = 0
 
 [nosetests]
 verbose = True
 verbosity = 2
-with-pylons = test.ini
+with-pylons = kallithea/tests/test.ini
 detailed-errors = 1
 nologcapture = 1
 
+[pytest]
+# only look for tests in kallithea/tests
+python_files = kallithea/tests/**/test_*.py
+addopts =
+    # --verbose
+    # show extra test summary info as specified by chars (f)ailed, (E)error, (s)skipped, (x)failed, (X)passed, (w)warnings.
+    -rfEsxXw
+    # Shorter scrollbacks; less stuff to scroll through
+    --tb=short
+
 [compile_catalog]
 domain = kallithea
 directory = kallithea/i18n
@@ -40,4 +50,3 @@ all_files = 1
 
 [upload_sphinx]
 upload-dir = docs/_build/html
-