diff --git a/tox.ini b/tox.ini
index 793bf5da..3226f30f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,6 +12,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 bin/swift swiftclient tests