diff --git a/tox.ini b/tox.ini
index 77b25df2c..5764e3fb4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,15 +2,16 @@
 distshare={homedir}/.tox/distshare
 envlist=py26,py27,py31,py32,py27-xdist,py25,py24
 indexserver=
-    default = http://pypi.python.org/simple
+    pypi = http://pypi.python.org/simple
     testrun = http://pypi.testrun.org
+    default = http://pypi.testrun.org
 
 [testenv]
 changedir=testing
 commands= py.test -rfsxX --junitxml={envlogdir}/junit-{envname}.xml []
 deps=
-    pexpect
-    nose
+    :pypi:pexpect
+    :pypi:nose
 
 [testenv:genscript]
 changedir=.
@@ -28,7 +29,7 @@ commands=
 [testenv:trial]
 changedir=.
 basepython=python2.6
-deps=twisted
+deps=:pypi:twisted
 commands=
   py.test -rsxf \
         --junitxml={envlogdir}/junit-{envname}.xml [testing/test_unittest.py]
@@ -41,15 +42,15 @@ deps=
 [testenv:doc]
 basepython=python
 changedir=doc
-deps=sphinx
+deps=:pypi:sphinx
      pytest
 
 commands=
     make html
 
 [testenv:py31]
-deps=py>=1.4.0
-    nose>=1.0
+deps=py>1.4.0
+    :pypi:nose>=1.0
 
 [testenv:py31-xdist]
 deps=pytest-xdist
@@ -64,7 +65,7 @@ deps=py>=1.4.0
 changedir=testing
 commands=
     {envpython} {envbindir}/py.test-jython --no-tools-on-path \
-        -rfsxX --junitxml={envlogdir}/junit-{envname}2.xml [acceptance_test.py plugin]
+        -rfsxX --junitxml={envlogdir}/junit-{envname}2.xml []
 
 [pytest]
 minversion=2.0