diff --git a/setup.py b/setup.py
index a128eeb89..2dfa38f8a 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@
     'pytest-cov',
     ]
 
-from setuptools import setup, find_namespace_packages
+from setuptools import setup
 here = os.path.abspath(os.path.dirname(__file__))
 try:
     with open(os.path.join(here, 'README.rst'), 'r') as f:
@@ -91,13 +91,18 @@
     classifiers=CLASSIFIERS,
     author="Chris McDonough",
     author_email="chrism@plope.com",
-    packages=find_namespace_packages(exclude=["docs","supervisor.tests","supervisor.tests.*"]),
-    package_dir={"": "."},
-    package_data={
-        "supervisor": ["version.txt"],
-        "supervisor.ui": ["**/*"],
-        "supervisor.skel": ["*"]
-    },
+    packages=[
+        'supervisor',
+        'supervisor.medusa',
+        'supervisor.scripts',
+        'supervisor.skel',
+        'supervisor.tests',
+        'supervisor.tests.fixtures',
+        'supervisor.tests.fixtures.example',
+        'supervisor.ui',
+        'supervisor.ui.images',
+        'supervisor.ui.stylesheets',
+    ],
     install_requires=requires,
     extras_require={
         'testing': testing_extras,