diff --git a/tox.ini b/tox.ini
index a498e5261..65630888b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,6 +14,11 @@ deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --testr-args='{posargs}'
 
+[testenv:pypy]
+deps = setuptools<3.2
+       -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+
 [testenv:pep8]
 commands = flake8
 distribute = false