diff --git a/ci/hardware_tests/device/t1.py b/ci/hardware_tests/device/t1.py
index 768f7c3b4..55a9e0853 100644
--- a/ci/hardware_tests/device/t1.py
+++ b/ci/hardware_tests/device/t1.py
@@ -20,8 +20,10 @@ class TrezorOne(Device):
             unofficial = False
             trezorctlcmd = "trezorctl firmware-update &"
             print("[software/trezorctl] Updating the firmware to latest...")
+        self.wait(3)
         self._enter_bootloader()
 
+        self.wait(3)
         os.system(trezorctlcmd)
         self.wait(3)
         self.touch("right", "click")
diff --git a/ci/test.yml b/ci/test.yml
index 0a4c80bbc..40a65b1d6 100644
--- a/ci/test.yml
+++ b/ci/test.yml
@@ -335,3 +335,4 @@ hardware legacy device test:
     paths:
       - ci/hardware_tests/video*.mp4
     expire_in: 2 days
+    when: always