diff --git a/core/tests/test_trezor.wire.thp.py b/core/tests/test_trezor.wire.thp.py
index dac468dae3..677c19149e 100644
--- a/core/tests/test_trezor.wire.thp.py
+++ b/core/tests/test_trezor.wire.thp.py
@@ -2,7 +2,7 @@ from common import *  # isort:skip
 from mock_wire_interface import MockHID
 from trezor import config, io, protobuf
 from trezor.crypto.curve import curve25519
-from trezor.enums import MessageType
+from trezor.enums import MessageType, ThpMessageType
 from trezor.wire.errors import UnexpectedMessage
 from trezor.wire.protocol_common import Message
 
@@ -265,7 +265,7 @@ class TestTrezorHostProtocol(unittest.TestCase):
     def test_skip_pairing(self):
         config.init()
         config.wipe()
-        channel = thp_main._CHANNELS[4660]
+        channel = next(iter(thp_main._CHANNELS.values()))
         channel.selected_pairing_methods = [
             ThpPairingMethod.NoMethod,
             ThpPairingMethod.CodeEntry,
@@ -318,7 +318,7 @@ class TestTrezorHostProtocol(unittest.TestCase):
         msg_code_entry = ThpCodeEntryChallenge(challenge=b"\x12\x34")
         buffer: bytearray = bytearray(protobuf.encoded_length(msg_code_entry))
         protobuf.encode(buffer, msg_code_entry)
-        code_entry_challenge = Message(MessageType.ThpCodeEntryChallenge, buffer)
+        code_entry_challenge = Message(ThpMessageType.ThpCodeEntryChallenge, buffer)
         gen.send(code_entry_challenge)
 
         # tag_qrc = b"\x55\xdf\x6c\xba\x0b\xe9\x5e\xd1\x4b\x78\x61\xec\xfa\x07\x9b\x5d\x37\x60\xd8\x79\x9c\xd7\x89\xb4\x22\xc1\x6f\x39\xde\x8f\x3b\xc3"
@@ -337,7 +337,7 @@ class TestTrezorHostProtocol(unittest.TestCase):
         buffer: bytearray = bytearray(protobuf.encoded_length(msg))
 
         protobuf.encode(buffer, msg)
-        user_message = Message(MessageType.ThpCodeEntryCpaceHost, buffer)
+        user_message = Message(ThpMessageType.ThpCodeEntryCpaceHost, buffer)
         gen.send(user_message)
 
         tag_ent = b"\xd0\x15\xd6\x72\x7c\xa6\x9b\x2a\x07\xfa\x30\xee\x03\xf0\x2d\x04\xdc\x96\x06\x77\x0c\xbd\xb4\xaa\x77\xc7\x68\x6f\xae\xa9\xdd\x81"
@@ -346,14 +346,14 @@ class TestTrezorHostProtocol(unittest.TestCase):
         buffer: bytearray = bytearray(protobuf.encoded_length(msg))
 
         protobuf.encode(buffer, msg)
-        user_message = Message(MessageType.ThpCodeEntryTag, buffer)
+        user_message = Message(ThpMessageType.ThpCodeEntryTag, buffer)
         gen.send(user_message)
 
         host_static_pubkey = b"\x00\x11\x22\x33\x44\x55\x66\x77\x00\x11\x22\x33\x44\x55\x66\x77\x00\x11\x22\x33\x44\x55\x66\x77\x00\x11\x22\x33\x44\x55\x66\x77\x00\x11\x22\x33\x44\x55\x66\x77\x00\x11\x22\x33\x44\x55\x66\x77"
         msg = ThpCredentialRequest(host_static_pubkey=host_static_pubkey)
         buffer: bytearray = bytearray(protobuf.encoded_length(msg))
         protobuf.encode(buffer, msg)
-        credential_request = Message(MessageType.ThpCredentialRequest, buffer)
+        credential_request = Message(ThpMessageType.ThpCredentialRequest, buffer)
         gen.send(credential_request)
 
         msg = ThpEndRequest()