diff --git a/requirements/dev.pip b/requirements/dev.pip
index 2bc8719..2b23adb 100644
--- a/requirements/dev.pip
+++ b/requirements/dev.pip
@@ -12,7 +12,7 @@ tox
 wheel
 pytest>=2.3
 webtest;        python_version != '2.5'
-mock;           python_version < '3'
+mock;           python_version <= '3.2'
 gevent>=1.1b4;  python_version >= '3'
 twine>=1.6.0
 
diff --git a/setup.py b/setup.py
index 49dddc5..7feaf07 100644
--- a/setup.py
+++ b/setup.py
@@ -4,14 +4,17 @@ import sys
 
 from setuptools import setup
 
-tests_require =  ['pytest>=2.3', 'tox', 'twine']
 if sys.version_info >= (3, 0):
     exec("def do_exec(co, loc): exec(co, loc)\n")
 else:
     exec("def do_exec(co, loc): exec co in loc\n")
+
+tests_require =  ['pytest>=2.3', 'tox', 'twine']
+if sys.version_info <= (3, 2):
     tests_require.append('mock')
 
 
+
 def get_version():
     d = {}
     try:
@@ -32,7 +35,9 @@ setup(name="pypiserver",
           'setuptools-git >= 0.3',  # Gather package-data from all files in git.
           'wheel',
       ],
-      install_requires=['passlib'],
+      extras_require={
+            'passlib': ['passlib']
+      },
       tests_require=tests_require,
       url="https://github.com/pypiserver/pypiserver",
       maintainer="Kostis Anagnostopoulos",