diff --git a/tox.ini b/tox.ini
index 4c691a85b..d3b67e629 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,21 +7,18 @@ envlist = py26,py27,cover,lint
 
 [testenv]
 commands =
-    python setup.py develop easy_install letsencrypt[testing]
+    pip install -e .[testing]
     python setup.py test -q # -q does not suppress errors
 
-# quickfix for #235
-deps = pip<6.0.7
-
 [testenv:cover]
 basepython = python2.7
 commands =
-    python setup.py develop easy_install letsencrypt[testing]
+    pip install -e .[testing]
     python setup.py nosetests --with-coverage --cover-min-percentage=66
 
 [testenv:lint]
 # recent versions of pylint do not support Python 2.6 (#97, #187)
 basepython = python2.7
 commands =
-    python setup.py dev
+    pip install -e .[dev]
     pylint --rcfile=.pylintrc letsencrypt