1 files changed, 4 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index 12284f26..4b983e3f 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,8 @@ setup(
         'beaker',
         'wtforms',
         'py-bcrypt',
-        'nose',
+        'pytest',
+        'pytest-xdist',
         'werkzeug>=0.7',
         'celery==2.5.3',
         'kombu==2.1.7',
@@ -54,11 +55,12 @@ setup(
         'sphinx',
         'Babel',
         'argparse',
-        'webtest',
+        'webtest<2',
         'ConfigObj',
         'Markdown',
         'sqlalchemy>=0.7.0',
         'sqlalchemy-migrate',
+        'mock',
         ## This is optional!
         # 'translitcodec',
         ## For now we're expecting that users will install this from