diff --git a/tests/upgrade_tests/test_firmware_upgrades.py b/tests/upgrade_tests/test_firmware_upgrades.py
index dd0180be3d..a6ea805c87 100644
--- a/tests/upgrade_tests/test_firmware_upgrades.py
+++ b/tests/upgrade_tests/test_firmware_upgrades.py
@@ -137,11 +137,11 @@ def test_storage_upgrade_progressive(gen: str, tags: List[str]):
         assert client.features.initialized
         assert client.features.label == LABEL
         client.use_pin_sequence([PIN])
-        assert btc.get_address(client, "Bitcoin", PATH) == ADDRESS
+        assert btc.get_address(client.get_session(), "Bitcoin", PATH) == ADDRESS
 
     with EmulatorWrapper(gen, tags[0]) as emu:
         debuglink.load_device_by_mnemonic(
-            emu.client,
+            emu.client.get_management_session(),
             mnemonic=MNEMONIC,
             pin=PIN,
             passphrase_protection=False,
@@ -171,10 +171,7 @@ def test_upgrade_wipe_code(gen: str, tag: str):
         assert client.features.initialized
         assert client.features.label == LABEL
         client.use_pin_sequence([PIN])
-        assert (
-            btc.get_address(client.get_session(passphrase=""), "Bitcoin", PATH)
-            == ADDRESS
-        )
+        assert btc.get_address(client.get_session(), "Bitcoin", PATH) == ADDRESS
 
     with EmulatorWrapper(gen, tag) as emu:
         debuglink.load_device_by_mnemonic(
@@ -205,7 +202,7 @@ def test_upgrade_wipe_code(gen: str, tag: str):
             exceptions.TrezorFailure,
             match="The new PIN must be different from your wipe code",
         ):
-            return device.change_pin(emu.client)
+            return device.change_pin(session)
 
 
 @for_all("legacy")