diff --git a/requirements-conda.txt b/requirements-conda.txt
index a3495b860f37ac838875a5ac1a6c1b23dbee54fa..4b020a0e0ea32f005fe19725ba7fa3defbcf79fe 100644
--- a/requirements-conda.txt
+++ b/requirements-conda.txt
@@ -20,3 +20,4 @@ h5py
 pygments
 sqlalchemy
 pandas
+mock
diff --git a/requirements-test-conda.txt b/requirements-test-conda.txt
index 20fae8eaea58c72fd29da3fd4161149e1a5bd234..f155fbb43d21dcc1a778a364ec056f2d1ce68d0d 100644
--- a/requirements-test-conda.txt
+++ b/requirements-test-conda.txt
@@ -2,7 +2,6 @@
 # Test requirements
 
 py
-mock
 pytest
 pytest-mock
 pytest-cov
diff --git a/setup.py b/setup.py
index 1ebc369870519ab2dc1a243fe3c6f743fc3cc9f7..a3b2e19abec86526bc349868da36a02e0fe1e332 100644
--- a/setup.py
+++ b/setup.py
@@ -116,13 +116,13 @@ def main():
         "h5py",
         "mendeleev",
         "pint",
+        'mock ; python_version < "3.3"',
     ]
 
     tests_require = [
         'pytest',
         'pytest-mock',
         'pytest-cov',
-        'mock ; python_version < "3.3"',
     ]
 
     setup_requires = [