1 files changed, 8 insertions, 4 deletions
diff --git a/setup.cfg b/setup.cfg
index 756233bd0..0bda22a2f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,10 +1,6 @@
 [easy_install]
 zip_ok = false
 
-[nosetests]
-match = ^test
-nocapture = 1
-
 [aliases]
 dev = develop easy_install pyramid[testing]
 docs = develop easy_install pyramid[docs]
@@ -15,9 +11,17 @@ license_file = LICENSE.txt
 [check-manifest]
 ignore =
     .gitignore
+    .gitattributes
     PKG-INFO
     *.egg-info
     *.egg-info/*
 ignore-default-rules = true
 ignore-bad-ideas =
     tests/pkgs/localeapp/**/*.mo
+    tests/pkgs/localeapp/**/*.mo
+
+[tool:pytest]
+python_files = test_*.py
+testpaths =
+    tests
+addopts = -W always