diff --git a/testing/test_slavemanage.py b/testing/test_slavemanage.py
index 3b6fa81..42f9f78 100644
--- a/testing/test_slavemanage.py
+++ b/testing/test_slavemanage.py
@@ -11,9 +11,9 @@ def pytest_funcarg__hookrecorder(request):
 
 def pytest_funcarg__hook(request):
     from xdist import newhooks
-    from pytest._core import HookRelay, Registry
+    from pytest._core import HookRelay, PluginManager
     from pytest import hookspec
-    return HookRelay([hookspec, newhooks], Registry())
+    return HookRelay([hookspec, newhooks], PluginManager())
 
 class pytest_funcarg__mysetup:
     def __init__(self, request):
diff --git a/tox.ini b/tox.ini
index b82c04c..2d7ada0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,17 +1,14 @@
 [tox]
 envlist=py26,py31,py27,py25,py24
-[tox:hudson]
-sdistsrc={distshare}/pytest-xdist-*
 
 [testenv]
+indexserver=http://pypi.testrun.org
 changedir=testing
-deps=
-    {distshare}/py-*
-commands=
-    py.test -rsfxX \
+deps=pytest
+commands= py.test -rsfxX \
             --junitxml={envlogdir}/junit-{envname}.xml []
 [testenv:py26]
 basepython=python2.6
 deps=
-    {distshare}/py-*
-    pexpect
+    pytest
+    #pexpect