diff --git a/tests/click_tests/test_autolock.py b/tests/click_tests/test_autolock.py
index 9de92b57ac..fd6639851c 100644
--- a/tests/click_tests/test_autolock.py
+++ b/tests/click_tests/test_autolock.py
@@ -218,7 +218,7 @@ def test_autolock_passphrase_keyboard(device_handler: "BackgroundDeviceHandler")
     # get address
     device_handler.run(common.get_test_address)  # type: ignore
 
-    assert "PassphraseKeyboard" in debug.read_layout().all_components()
+    debug.synchronize_at("PassphraseKeyboard")
 
     if debug.layout_type is LayoutType.Caesar:
         # Going into the selected character category
@@ -255,7 +255,7 @@ def test_autolock_interrupts_passphrase(device_handler: "BackgroundDeviceHandler
     # get address
     device_handler.run(common.get_test_address)  # type: ignore
 
-    assert "PassphraseKeyboard" in debug.read_layout().all_components()
+    debug.synchronize_at("PassphraseKeyboard")
 
     if debug.layout_type is LayoutType.Caesar:
         # Going into the selected character category
diff --git a/tests/click_tests/test_passphrase_bolt_delizia.py b/tests/click_tests/test_passphrase_bolt_delizia.py
index f97cf12f1e..2b96f85f0e 100644
--- a/tests/click_tests/test_passphrase_bolt_delizia.py
+++ b/tests/click_tests/test_passphrase_bolt_delizia.py
@@ -74,7 +74,7 @@ def prepare_passphrase_dialogue(
 ) -> Generator["DebugLink", None, None]:
     debug = device_handler.debuglink()
     device_handler.run(get_test_address)  # type: ignore
-    assert debug.read_layout().main_component() == "PassphraseKeyboard"
+    debug.synchronize_at("PassphraseKeyboard")
 
     # Resetting the category as it could have been changed by previous tests
     global KEYBOARD_CATEGORY
diff --git a/tests/click_tests/test_passphrase_caesar.py b/tests/click_tests/test_passphrase_caesar.py
index 57685451ba..0396e4206f 100644
--- a/tests/click_tests/test_passphrase_caesar.py
+++ b/tests/click_tests/test_passphrase_caesar.py
@@ -92,8 +92,7 @@ def prepare_passphrase_dialogue(
 ) -> Generator["DebugLink", None, None]:
     debug = device_handler.debuglink()
     device_handler.run(get_test_address)  # type: ignore
-    layout = debug.read_layout()
-    assert "PassphraseKeyboard" in layout.all_components()
+    layout = debug.synchronize_at("PassphraseKeyboard")
     assert layout.passphrase() == ""
     assert _current_category(debug) == PassphraseCategory.MENU