diff --git a/MANIFEST.in b/MANIFEST.in
index 84c7124..f989a21 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,4 @@
 include LICENSE
 include requirements.txt
+include test-requirements.txt
 include README.md
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 0fd86d8..0000000
--- a/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-test:prepare
-	venv/bin/python setup.py test
-
-clean:
-	rm -rf venv build dist *.egg-info
-	find . -name '*.pyc' -delete
-
-prepare:clean
-	set -ex
-	virtualenv venv
-	venv/bin/pip install mock
-	venv/bin/pip install -r requirements.txt
-	venv/bin/python setup.py install
diff --git a/setup.py b/setup.py
index ed5b22e..2ab4865 100644
--- a/setup.py
+++ b/setup.py
@@ -11,6 +11,7 @@ requirements =[
     "websocket-client >= 0.32.0, < 1"
 ]
 
+
 def read(*parts):
     path = os.path.join(os.path.dirname(__file__), *parts)
     with codecs.open(path, encoding='utf-8') as fobj:
@@ -25,12 +26,16 @@ def find_version(*file_paths):
         return version_match.group(1)
     raise RuntimeError('Unable to find version string.')
 
+with open('./test-requirements.txt') as test_reqs_txt:
+    test_requirements = [line for line in test_reqs_txt]
+
 
 setup(
         name="python-dockercloud",
         version=find_version('dockercloud', '__init__.py'),
         packages=find_packages(),
         install_requires=requirements,
+        tests_require=test_requirements,
         provides=['docker'],
         include_package_data=True,
         author="Docker, Inc.",
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 0000000..2e8cebf
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1,3 @@
+mock==1.0.1
+coverage==4.0.3
+nose==1.3.7