diff --git a/Makefile b/Makefile
index 7d78132..213b8e7 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,13 @@ default: dist
 init-py35:
 	@echo Building Python 3.5 virtualenv
 	test -d py35 || virtualenv py35 --no-site-packages --python=python3.5
-	py35/bin/pip install -r dev-requirements.txt
+	py35/bin/pip install -r requirements.txt
 	py35/bin/python setup.py develop
 
 init-py27:
 	@echo Building Python 2.7 virtualenv
 	test -d py27 || virtualenv py27 --no-site-packages --python=python2.7
-	py27/bin/pip install -r dev-requirements.txt
+	py27/bin/pip install -r requirements.txt
 	py27/bin/python setup.py develop
 
 test: init-py35
diff --git a/dev-requirements.txt b/dev-requirements.txt
deleted file mode 100644
index c646798..0000000
--- a/dev-requirements.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dev/Deployment
-pypi-publisher
-docker-py
-mock
-coverage
-tox
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index d0174d3..f0ffc28 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,4 @@
-docker-py
\ No newline at end of file
+docker-py
+mock
+coverage
+tox
diff --git a/tox.ini b/tox.ini
index 5b2a39a..842a48e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@
 [tox]
 envlist = py27,py35
 
-deps = -r{toxinidir}/dev-requirements.txt
+deps = -r{toxinidir}/requirements.txt
 
 [testenv]
 commands = coverage run -p setup.py test