diff --git a/tox.ini b/tox.ini
index 482235b64..a694ef893 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,24 +2,19 @@
 distshare={homedir}/.tox/distshare
 envlist=py26,py27,py31,py27-xdist,py25,py24
 
-[tox:hudson]
-distshare={toxworkdir}/distshare
-sdistsrc={distshare}/pytest-*
-
 [testenv]
+indexserver=http://pypi.testrun.org
 changedir=testing
-commands=
-  py.test -rfsxX --junitxml={envlogdir}/junit-{envname}.xml []
+commands= py.test -rfsxX --junitxml={envlogdir}/junit-{envname}.xml []
 deps=
-    {distshare}/pylib-*
-    pexpect
-    nose
+    pylib
+    #pexpect XXX
+    #nose    XXX
 
 [testenv:py27-xdist]
 basepython=python2.7
-deps=
-    {distshare}/pylib-*
-    {distshare}/pytest-xdist-*
+deps= pylib
+      pytest-xdist
 commands=
   py.test -n3 -rfsxX \
         --junitxml={envlogdir}/junit-{envname}.xml []
@@ -28,24 +23,23 @@ commands=
 basepython=python
 changedir=doc
 deps=sphinx
-     {distshare}/pylib-*
-     {distshare}/pytest-xdist-*
+     pylib
+     pytest-xdist
 
 commands=
     make html
 
 [testenv:py31]
-deps= {distshare}/pylib-*
+deps=pylib
 
 [testenv:py32]
-deps= {distshare}/pylib-*
+deps=pylib
+
+[testenv:pypy]
+basepython=pypy-c
 
-#{distshare}/pytest-xdist-*
-#[testenv:pypy]
-#python=pypy-c
 [testenv:jython]
 changedir=testing
-basepython=jython
 commands=
     {envpython} {envbindir}/py.test-jython \
         -rfsxX --junitxml={envlogdir}/junit-{envname}1.xml [io_ code]