diff --git a/setup.py b/setup.py
index 9745e7ad..254fae53 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#/usr/bin/env python
+#!/usr/bin/env python
 import os
 from setuptools import setup
 
@@ -13,6 +13,7 @@ setup(
     packages=['docker'],
     install_requires=['requests', 'six'] + test_requirements,
     zip_safe=False,
+    test_suite='tests',
     classifiers=['Development Status :: 3 - Alpha',
                  'Environment :: Other Environment',
                  'Intended Audience :: Developers',
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 00000000..e69de29b