diff --git a/Makefile b/Makefile
index bae0c34..411ae6e 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ publish:
 	python setup.py register sdist upload
 
 test:
-	python setup.py test
+	tox
 
 lint:
 	python setup.py flake8
diff --git a/requirements_dev.txt b/requirements_dev.txt
index 307ec00..9221417 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -4,3 +4,4 @@ mock==2.0.0
 Sphinx==1.4.8
 twine==1.8.1
 Twisted==16.4.1
+tox==2.3.1
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..171b849
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,8 @@
+[tox]
+envlist = py27, py35
+
+[testenv]
+commands = python setup.py test
+deps =
+    pytest
+    mock