diff --git a/MANIFEST.in b/MANIFEST.in
index 94be0c5..a0efbf6 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,17 @@
 include AUTHORS
 include LICENSE
 include README.rst
-recursive-include docs *
-recursive-include imagekit/templates *
-prune tests
+include testrunner.py
+include tests/*.py
+include tests/assets/Lenna.png
+include tests/assets/lenna-*.jpg
+include tests/media/lenna.png
+prune tests/media/CACHE
+prune tests/media/b
+prune tests/media/photos
+include docs/Makefile
+include docs/conf.py
+include docs/make.bat
+include docs/*.rst
+recursive-include docs/_themes LICENSE README.rst flask_theme_support.py theme.conf *.css_t *.css *.html
+recursive-include imagekit/templates *.html
diff --git a/setup.py b/setup.py
index 3e1408b..e2f34d0 100644
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@ setup(
     maintainer_email='bryan@revyver.com',
     license='BSD',
     url='http://github.com/matthewwithanm/django-imagekit/',
-    packages=find_packages(),
+    packages=find_packages(exclude=['*.tests', '*.tests.*', 'tests.*', 'tests']),
     zip_safe=False,
     include_package_data=True,
     tests_require=[