diff --git a/py/test/dsession/nodemanage.py b/py/test/dsession/nodemanage.py
index 702e8b789..5114da2f6 100644
--- a/py/test/dsession/nodemanage.py
+++ b/py/test/dsession/nodemanage.py
@@ -1,8 +1,7 @@
 import py
 import sys, os
-from py.__.test.dsession.masterslave import MasterNode
+from py.__.test.dsession.txnode import MasterNode
 from py.__.execnet.gwmanage import GatewayManager
-from py.__.test import event
 
     
 class NodeManager(object):
diff --git a/py/test/dsession/testing/test_functional_dsession.py b/py/test/dsession/testing/test_functional_dsession.py
index e09d96a5b..09f9827a0 100644
--- a/py/test/dsession/testing/test_functional_dsession.py
+++ b/py/test/dsession/testing/test_functional_dsession.py
@@ -1,6 +1,6 @@
 import py
 from py.__.test.dsession.dsession import DSession
-from test_masterslave import EventQueue
+from test_txnode import EventQueue
 
 class TestAsyncFunctional:
     def test_conftest_options(self, testdir):
diff --git a/py/test/dsession/testing/test_masterslave.py b/py/test/dsession/testing/test_txnode.py
similarity index 98%
rename from py/test/dsession/testing/test_masterslave.py
rename to py/test/dsession/testing/test_txnode.py
index 50954cc84..b7e3df0e8 100644
--- a/py/test/dsession/testing/test_masterslave.py
+++ b/py/test/dsession/testing/test_txnode.py
@@ -1,6 +1,6 @@
 
 import py
-from py.__.test.dsession.masterslave import MasterNode
+from py.__.test.dsession.txnode import MasterNode
 
 class EventQueue:
     def __init__(self, bus, queue=None):
diff --git a/py/test/dsession/masterslave.py b/py/test/dsession/txnode.py
similarity index 98%
rename from py/test/dsession/masterslave.py
rename to py/test/dsession/txnode.py
index dec97c850..1dd97600e 100644
--- a/py/test/dsession/masterslave.py
+++ b/py/test/dsession/txnode.py
@@ -67,7 +67,7 @@ class MasterNode(object):
 def install_slave(gateway, config):
     channel = gateway.remote_exec(source="""
         from py.__.test.dsession.mypickle import PickleChannel
-        from py.__.test.dsession.masterslave import SlaveNode
+        from py.__.test.dsession.txnode import SlaveNode
         channel = PickleChannel(channel)
         slavenode = SlaveNode(channel)
         slavenode.run()