diff --git a/setup.py b/setup.py
index 4275ba012d..d5bfe48e9c 100644
--- a/setup.py
+++ b/setup.py
@@ -226,6 +226,12 @@ def finalize_options(self):
 """
 
 
+test_env = ['testfixtures',
+            'unittest2',
+            'Morfessor==2.0.2a4',
+            'scikit-learn',
+            'pyemd']
+
 setup(
     name='gensim',
     version='2.1.0',
@@ -282,15 +288,11 @@ def finalize_options(self):
         'six >= 1.5.0',
         'smart_open >= 1.2.1',
     ],
+    tests_require=test_env,
     extras_require={
         'distributed': ['Pyro4 >= 4.27'],
         'wmd': ['pyemd >= 0.2.0'],
-        'test': [
-            'testfixtures',
-            'unittest2',
-            'Morfessor==2.0.2a4',
-            'scikit-learn'
-        ],
+        'test': test_env,
     },
 
     include_package_data=True,