diff --git a/tests/device_tests/zcash/test_sign_tx.py b/tests/device_tests/zcash/test_sign_tx.py
index d689c8af96..4d7df80090 100644
--- a/tests/device_tests/zcash/test_sign_tx.py
+++ b/tests/device_tests/zcash/test_sign_tx.py
@@ -17,7 +17,7 @@
 import pytest
 
 from trezorlib import btc, messages
-from trezorlib.debuglink import TrezorClientDebugLink as Client
+from trezorlib.debuglink import SessionDebugWrapper as Session
 from trezorlib.exceptions import TrezorFailure
 from trezorlib.tools import parse_path
 
@@ -53,7 +53,7 @@ BRANCH_ID = 0xC2D6D0B4
 pytestmark = [pytest.mark.altcoin, pytest.mark.zcash]
 
 
-def test_version_group_id_missing(client: Client):
+def test_version_group_id_missing(session: Session):
     inp1 = messages.TxInputType(
         # tmQoJ3PTXgQLaRRZZYT6xk8XtjRbr2kCqwu
         address_n=parse_path("m/44h/1h/0h/0/0"),
@@ -69,7 +69,7 @@ def test_version_group_id_missing(client: Client):
 
     with pytest.raises(TrezorFailure, match="Version group ID must be set."):
         btc.sign_tx(
-            client,
+            session,
             "Zcash Testnet",
             [inp1],
             [out1],
@@ -77,7 +77,7 @@ def test_version_group_id_missing(client: Client):
         )
 
 
-def test_spend_v4_input(client: Client):
+def test_spend_v4_input(session: Session):
     # 4b6cecb81c825180786ebe07b65bcc76078afc5be0f1c64e08d764005012380d is a v4 tx
 
     inp1 = messages.TxInputType(
@@ -95,13 +95,13 @@ def test_spend_v4_input(client: Client):
         script_type=messages.OutputScriptType.PAYTOADDRESS,
     )
 
-    with client:
-        client.set_expected_responses(
+    with session:
+        session.set_expected_responses(
             [
                 request_input(0),
                 request_output(0),
                 messages.ButtonRequest(code=B.ConfirmOutput),
-                (is_core(client), messages.ButtonRequest(code=B.ConfirmOutput)),
+                (is_core(session), messages.ButtonRequest(code=B.ConfirmOutput)),
                 messages.ButtonRequest(code=B.SignTx),
                 request_input(0),
                 request_output(0),
@@ -110,7 +110,7 @@ def test_spend_v4_input(client: Client):
         )
 
         _, serialized_tx = btc.sign_tx(
-            client,
+            session,
             "Zcash Testnet",
             [inp1],
             [out1],
@@ -126,7 +126,7 @@ def test_spend_v4_input(client: Client):
         )
 
 
-def test_send_to_multisig(client: Client):
+def test_send_to_multisig(session: Session):
     inp1 = messages.TxInputType(
         # tmQoJ3PTXgQLaRRZZYT6xk8XtjRbr2kCqwu
         address_n=parse_path("m/44h/1h/0h/0/8"),
@@ -143,13 +143,13 @@ def test_send_to_multisig(client: Client):
         script_type=messages.OutputScriptType.PAYTOSCRIPTHASH,
     )
 
-    with client:
-        client.set_expected_responses(
+    with session:
+        session.set_expected_responses(
             [
                 request_input(0),
                 request_output(0),
                 messages.ButtonRequest(code=B.ConfirmOutput),
-                (is_core(client), messages.ButtonRequest(code=B.ConfirmOutput)),
+                (is_core(session), messages.ButtonRequest(code=B.ConfirmOutput)),
                 messages.ButtonRequest(code=B.SignTx),
                 request_input(0),
                 request_output(0),
@@ -158,7 +158,7 @@ def test_send_to_multisig(client: Client):
         )
 
         _, serialized_tx = btc.sign_tx(
-            client,
+            session,
             "Zcash Testnet",
             [inp1],
             [out1],
@@ -174,7 +174,7 @@ def test_send_to_multisig(client: Client):
         )
 
 
-def test_spend_v5_input(client: Client):
+def test_spend_v5_input(session: Session):
     inp1 = messages.TxInputType(
         # tmBMyeJebzkP5naji8XUKqLyL1NDwNkgJFt
         address_n=parse_path("m/44h/1h/0h/0/9"),
@@ -190,13 +190,13 @@ def test_spend_v5_input(client: Client):
         script_type=messages.OutputScriptType.PAYTOADDRESS,
     )
 
-    with client:
-        client.set_expected_responses(
+    with session:
+        session.set_expected_responses(
             [
                 request_input(0),
                 request_output(0),
                 messages.ButtonRequest(code=B.ConfirmOutput),
-                (is_core(client), messages.ButtonRequest(code=B.ConfirmOutput)),
+                (is_core(session), messages.ButtonRequest(code=B.ConfirmOutput)),
                 messages.ButtonRequest(code=B.SignTx),
                 request_input(0),
                 request_output(0),
@@ -205,7 +205,7 @@ def test_spend_v5_input(client: Client):
         )
 
         _, serialized_tx = btc.sign_tx(
-            client,
+            session,
             "Zcash Testnet",
             [inp1],
             [out1],
@@ -221,7 +221,7 @@ def test_spend_v5_input(client: Client):
         )
 
 
-def test_one_two(client: Client):
+def test_one_two(session: Session):
     inp1 = messages.TxInputType(
         # tmQoJ3PTXgQLaRRZZYT6xk8XtjRbr2kCqwu
         address_n=parse_path("m/44h/1h/0h/0/0"),
@@ -243,13 +243,13 @@ def test_one_two(client: Client):
         script_type=messages.OutputScriptType.PAYTOADDRESS,
     )
 
-    with client:
-        client.set_expected_responses(
+    with session:
+        session.set_expected_responses(
             [
                 request_input(0),
                 request_output(0),
                 messages.ButtonRequest(code=B.ConfirmOutput),
-                (is_core(client), messages.ButtonRequest(code=B.ConfirmOutput)),
+                (is_core(session), messages.ButtonRequest(code=B.ConfirmOutput)),
                 request_output(1),
                 messages.ButtonRequest(code=B.SignTx),
                 request_input(0),
@@ -260,7 +260,7 @@ def test_one_two(client: Client):
         )
 
         _, serialized_tx = btc.sign_tx(
-            client,
+            session,
             "Zcash Testnet",
             [inp1],
             [out1, out2],
@@ -277,7 +277,7 @@ def test_one_two(client: Client):
 
 
 @pytest.mark.models("core")
-def test_unified_address(client: Client):
+def test_unified_address(session: Session):
     # identical to the test_one_two
     # but receiver address is unified with an orchard address
     inp1 = messages.TxInputType(
@@ -301,13 +301,13 @@ def test_unified_address(client: Client):
         script_type=messages.OutputScriptType.PAYTOADDRESS,
     )
 
-    with client:
-        client.set_expected_responses(
+    with session:
+        session.set_expected_responses(
             [
                 request_input(0),
                 request_output(0),
                 messages.ButtonRequest(code=B.ConfirmOutput),
-                (is_core(client), messages.ButtonRequest(code=B.ConfirmOutput)),
+                (is_core(session), messages.ButtonRequest(code=B.ConfirmOutput)),
                 request_output(1),
                 messages.ButtonRequest(code=B.SignTx),
                 request_input(0),
@@ -318,7 +318,7 @@ def test_unified_address(client: Client):
         )
 
         _, serialized_tx = btc.sign_tx(
-            client,
+            session,
             "Zcash Testnet",
             [inp1],
             [out1, out2],
@@ -335,7 +335,7 @@ def test_unified_address(client: Client):
 
 
 @pytest.mark.models("core")
-def test_external_presigned(client: Client):
+def test_external_presigned(session: Session):
     inp1 = messages.TxInputType(
         # tmQoJ3PTXgQLaRRZZYT6xk8XtjRbr2kCqwu
         address_n=parse_path("m/44h/1h/0h/0/0"),
@@ -365,14 +365,14 @@ def test_external_presigned(client: Client):
         script_type=messages.OutputScriptType.PAYTOADDRESS,
     )
 
-    with client:
-        client.set_expected_responses(
+    with session:
+        session.set_expected_responses(
             [
                 request_input(0),
                 request_input(1),
                 request_output(0),
                 messages.ButtonRequest(code=B.ConfirmOutput),
-                (is_core(client), messages.ButtonRequest(code=B.ConfirmOutput)),
+                (is_core(session), messages.ButtonRequest(code=B.ConfirmOutput)),
                 messages.ButtonRequest(code=B.SignTx),
                 request_input(1),
                 request_input(0),
@@ -383,7 +383,7 @@ def test_external_presigned(client: Client):
         )
 
         _, serialized_tx = btc.sign_tx(
-            client,
+            session,
             "Zcash Testnet",
             [inp1, inp2],
             [out1],
@@ -399,7 +399,7 @@ def test_external_presigned(client: Client):
         )
 
 
-def test_refuse_replacement_tx(client: Client):
+def test_refuse_replacement_tx(session: Session):
     inp1 = messages.TxInputType(
         address_n=parse_path("m/44h/1h/0h/0/4"),
         amount=174998,
@@ -437,7 +437,7 @@ def test_refuse_replacement_tx(client: Client):
         TrezorFailure, match="Replacement transactions are not supported."
     ):
         btc.sign_tx(
-            client,
+            session,
             "Zcash Testnet",
             [inp1],
             [out1, out2],
@@ -447,12 +447,12 @@ def test_refuse_replacement_tx(client: Client):
         )
 
 
-def test_spend_multisig(client: Client):
+def test_spend_multisig(session: Session):
     # Cloned from tests/device_tests/bitcoin/test_multisig.py::test_2_of_3
 
     nodes = [
         btc.get_public_node(
-            client, parse_path(f"m/48h/1h/{index}h/0h"), coin_name="Zcash Testnet"
+            session, parse_path(f"m/48h/1h/{index}h/0h"), coin_name="Zcash Testnet"
         ).node
         for index in range(1, 4)
     ]
@@ -482,17 +482,17 @@ def test_spend_multisig(client: Client):
         request_input(0),
         request_output(0),
         messages.ButtonRequest(code=B.ConfirmOutput),
-        (is_core(client), messages.ButtonRequest(code=B.ConfirmOutput)),
+        (is_core(session), messages.ButtonRequest(code=B.ConfirmOutput)),
         messages.ButtonRequest(code=B.SignTx),
         request_input(0),
         request_output(0),
         request_finished(),
     ]
 
-    with client:
-        client.set_expected_responses(expected_responses)
+    with session:
+        session.set_expected_responses(expected_responses)
         signatures1, _ = btc.sign_tx(
-            client,
+            session,
             "Zcash Testnet",
             [inp1],
             [out1],
@@ -529,10 +529,10 @@ def test_spend_multisig(client: Client):
         multisig=multisig,
     )
 
-    with client:
-        client.set_expected_responses(expected_responses)
+    with session:
+        session.set_expected_responses(expected_responses)
         signatures2, serialized_tx = btc.sign_tx(
-            client,
+            session,
             "Zcash Testnet",
             [inp3],
             [out1],