diff --git a/tox.ini b/tox.ini
index 86051e675..4883a31f1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,16 +1,19 @@
 [tox]
 distshare={homedir}/.tox/distshare
 envlist=py26,py27,py31,py32,py27-xdist,py25,py24
-indexserver=
-    default http://pypi.testrun.org
-    pypi http://pypi.python.org/simple
+
+[indexserver:default]
+url = http://pypi.testrun.org
+
+[indexserver:pypi]
+url = http://pypi.python.org/simple
 
 [testenv]
 changedir=testing
 commands= py.test -rfsxX --junitxml={envlogdir}/junit-{envname}.xml []
 deps=
-    pypi pexpect
-    pypi nose
+    :pypi:pexpect
+    :pypi:nose
 
 [testenv:genscript]
 changedir=.
@@ -27,7 +30,7 @@ commands=
 [testenv:doc]
 basepython=python
 changedir=doc
-deps=pypi sphinx
+deps=:pypi:sphinx
      pytest
 
 commands=