diff --git a/tox.ini b/tox.ini
index 539fa4e86..80397c3d3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,15 +1,17 @@
 [tox]
 distshare={homedir}/.tox/distshare
 envlist=py26,py27,py31,py27-xdist,py25,py24
+indexserver=
+    default http://pypi.testrun.org
+    pypi http://pypi.python.org/simple
 
 [testenv]
-indexserver=http://pypi.testrun.org
 changedir=testing
 commands= py.test -rfsxX --junitxml={envlogdir}/junit-{envname}.xml []
 deps=
     pylib
-    #pexpect XXX
-    #nose    XXX
+    pypi pexpect
+    pypi nose
 
 [testenv:py27-xdist]
 basepython=python2.7
@@ -22,7 +24,8 @@ commands=
 [testenv:doc]
 basepython=python
 changedir=doc
-deps=sphinx
+deps=
+     pypi sphinx
      pylib
      pytest-xdist
 
@@ -30,10 +33,10 @@ commands=
     make html
 
 [testenv:py31]
-deps=pylib
+deps=dev pylib
 
 [testenv:py32]
-deps=pylib
+deps=dev pylib
 
 [testenv:pypy]
 basepython=pypy-c