diff --git a/doc/conf.py b/doc/conf.py
index 77d69ba7..a7a1bd98 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -27,7 +27,7 @@ try:
     import numpy
     import pylab
 except ImportError:
-    from mock import MagicMock
+    from unittest.mock import MagicMock
 
     MOCK_MODULES = ['numpy', 'pylab', 'scipy']
     for mod_name in MOCK_MODULES:
diff --git a/setup.py b/setup.py
index aec5e4ed..432b8b13 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', 'mock'],
+      install_requires=['sympy', 'numpy>=1.6', 'scipy>=0.9','matplotlib>=1.1'],
       setup_requires=['sphinx'],
       cmdclass = {'build_sphinx': BuildDoc},
       classifiers=[