diff --git a/doc/conf.py b/doc/conf.py
index 3b57514d..77d69ba7 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -29,8 +29,7 @@ try:
 except ImportError:
     from mock import MagicMock
 
-    MOCK_MODULES = ['numpy', 'quantities', 'scipy', 'scipy.spatial',
-                    'scipy.spatial.distance']
+    MOCK_MODULES = ['numpy', 'pylab', 'scipy']
     for mod_name in MOCK_MODULES:
         sys.modules[mod_name] = MagicMock()
 
@@ -50,7 +49,7 @@ except ImportError:
     #sys.modules['guiqwt.tools'].CommandTool = CommandTool
     #sys.modules['guiqwt.tools'].InteractiveTool = InteractiveTool
 
-import Gpy
+import GPy
     
 
 # If your extensions are in another directory, add it here. If the directory
diff --git a/setup.py b/setup.py
index 432b8b13..aec5e4ed 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ setup(name = 'GPy',
       long_description=read('README.md'),
       #ext_modules =  [Extension(name = 'GPy.kern.lfmUpsilonf2py',
       #          sources = ['GPy/kern/src/lfmUpsilonf2py.f90'])],
-      install_requires=['sympy', 'numpy>=1.6', 'scipy>=0.9','matplotlib>=1.1'],
+      install_requires=['sympy', 'numpy>=1.6', 'scipy>=0.9','matplotlib>=1.1', 'mock'],
       setup_requires=['sphinx'],
       cmdclass = {'build_sphinx': BuildDoc},
       classifiers=[