diff --git a/tox.ini b/tox.ini
index 70b757e8c5..5a0ed94fab 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,11 +23,6 @@ commands = generate-constraints {posargs}
 [testenv:validate]
 commands = validate-constraints {toxinidir}/global-requirements.txt {toxinidir}/upper-constraints.txt {toxinidir}/blacklist.txt
 
-# work around until pypy vs. setuptools issue in bug 1290562 is fixed
-[testenv:pypy]
-deps = setuptools>3.4
-     -r{toxinidir}/test-requirements.txt
-
 [testenv:pep8]
 commands = flake8