diff --git a/tests/common.py b/tests/common.py
index d48e38f24e..4173610e5a 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -11,11 +11,11 @@ class BitkeyTest(unittest.TestCase):
         self.transport = config.TRANSPORT(*config.TRANSPORT_ARGS)
         self.bitkey = BitkeyClient(self.transport, DebugLink(self.debug_transport), debug=True)
         
-        self.bitkey.setup_debuglink(button=True, pin_correct=True, otp_correct=True)
+        self.bitkey.setup_debuglink(button=True, pin_correct=True)
         
-        self.bitkey.load_device(algo=proto.ELECTRUM,
+        self.bitkey.load_device(
             seed='beyond neighbor scratch swirl embarrass doll cause also stick softly physical nice',
-            otp=True, pin='1234', spv=True)
+            pin='1234')
         
         print "Setup finished"
         print "--------------"
diff --git a/tests/config.py b/tests/config.py
index 9113cb5107..1f3e485870 100644
--- a/tests/config.py
+++ b/tests/config.py
@@ -6,7 +6,7 @@ from bitkeylib.transport_hid import HidTransport
 from bitkeylib.transport_socket import SocketTransportClient
 
 TRANSPORT = PipeTransport
-TRANSPORT_ARGS = ('../../bitkey-python/bitkey.pipe', False)
+TRANSPORT_ARGS = ('../../trezor-emu/pipe.trezor', False)
 
 #TRANSPORT = HidTransport
 #TRANSPORT_ARGS = ('0x10c4:0xea80:000868D3', False)
@@ -15,7 +15,7 @@ TRANSPORT_ARGS = ('../../bitkey-python/bitkey.pipe', False)
 #TRANSPORT_ARGS = ('trezor.dyn:3000', False)
 
 DEBUG_TRANSPORT = PipeTransport
-DEBUG_TRANSPORT_ARGS = ('../../bitkey-python/bitkey_debug.pipe', False)
+DEBUG_TRANSPORT_ARGS = ('../../trezor-emu/pipe.trezor_debug', False)
 
 #DEBUG_TRANSPORT = SocketTransportClient
 #DEBUG_TRANSPORT_ARGS = ('trezor.dyn:2000', False)
diff --git a/tests/test_basic.py b/tests/test_basic.py
index aba4652b35..6ff7d65a83 100644
--- a/tests/test_basic.py
+++ b/tests/test_basic.py
@@ -14,7 +14,7 @@ from bitkeylib import proto
 
 class TestBasic(common.BitkeyTest):           
     def test_features(self):
-        features = self.bitkey.call(proto.Initialize(session_id=self.bitkey.session_id))
+        features = self.bitkey.call(proto.Initialize())
         
         # Result is the same as reported by BitkeyClient class
         self.assertEqual(features, self.bitkey.features)