diff --git a/setup.py b/setup.py
index e3593b3c..c4963bcc 100644
--- a/setup.py
+++ b/setup.py
@@ -20,6 +20,7 @@ setup(name = 'GPy',
       url = "http://sheffieldml.github.com/GPy/",
       packages = ["GPy.models",
                   "GPy.inference.optimization",
+                  "GPy.inference.mcmc",
                   "GPy.inference",
                   "GPy.inference.latent_function_inference",
                   "GPy.likelihoods", "GPy.mappings",
@@ -31,14 +32,20 @@ setup(name = 'GPy',
                   "GPy.plotting.matplot_dep.latent_space_visualizations",
                   "GPy.plotting.matplot_dep", "GPy.plotting"],
       package_dir={'GPy': 'GPy'},
-      package_data = {'GPy': ['defaults.cfg', 'installation.cfg', 'util/data_resources.json', 'util/football_teams.json']},
+      package_data = {'GPy': ['defaults.cfg', 'installation.cfg',
+                              'util/data_resources.json',
+                              'util/football_teams.json']},
+      include_package_data = True,
       py_modules = ['GPy.__init__'],
+      test_suite = 'GPy.testing',
       long_description=read('README.md'),
-      install_requires=['numpy>=1.8', 'scipy>=0.14'],
-      extras_require = {
-        'docs':['matplotlib>=1.4','Sphinx','ipython'],
-      },
-      classifiers=[
-      "License :: OSI Approved :: BSD License"],
-      zip_safe = False
+      install_requires=['numpy>=1.7', 'scipy>=0.12'],
+      extras_require = {'docs':['matplotlib >=1.3','Sphinx','IPython']},
+      classifiers=['License :: OSI Approved :: BSD License',
+                   'Natural Language :: English',
+                   'Operating System :: MacOS :: MacOS X',
+                   'Operating System :: Microsoft :: Windows',
+                   'Operating System :: POSIX :: Linux',
+                   'Programming Language :: Python :: 2.7',
+                   'Topic :: Scientific/Engineering :: Artificial Intelligence']
       )