diff --git a/ci/hardware_tests/device/device.py b/ci/hardware_tests/device/device.py
index af3690bdec..a3631ee618 100644
--- a/ci/hardware_tests/device/device.py
+++ b/ci/hardware_tests/device/device.py
@@ -25,9 +25,7 @@ class Device:
         self.now()
         print("[hardware/usb] Turning power on...")
         os.system(
-            "uhubctl -l {} -p {} -a on > /dev/null".format(
-                self.uhub_location, self.device_port
-            )
+            "uhubctl -l {} -p {} -a on".format(self.uhub_location, self.device_port)
         )
         self.wait(3)
 
@@ -35,7 +33,7 @@ class Device:
         self.now()
         print("[hardware/usb] Turning power off...")
         os.system(
-            "uhubctl -l {} -p {} -r 100 -a off > /dev/null".format(
+            "uhubctl -l {} -p {} -r 100 -a off".format(
                 self.uhub_location, self.device_port
             )
         )
diff --git a/ci/hardware_tests/device/t1.py b/ci/hardware_tests/device/t1.py
index 49bcea1dab..7ef145b35a 100644
--- a/ci/hardware_tests/device/t1.py
+++ b/ci/hardware_tests/device/t1.py
@@ -31,7 +31,7 @@ class TrezorOne(Device):
         self.run_trezorctl(trezorctlcmd)
         self.wait(3)
         self.touch("right", "click")
-        self.wait(20)
+        self.wait(25)
         if unofficial:
             self.touch("right", "click")
         self.wait(10)
diff --git a/ci/hardware_tests/device/tt.py b/ci/hardware_tests/device/tt.py
index e78827fc43..8f439ab926 100644
--- a/ci/hardware_tests/device/tt.py
+++ b/ci/hardware_tests/device/tt.py
@@ -14,8 +14,8 @@ class TrezorT(Device):
 
         self.wait(5)
         print("[software] Updating the firmware to {}".format(file))
-        self.run_trezorctl("firmware-update -s -f {} &".format(file))
+        self.run_trezorctl("firmware-update -s -f {}".format(file))
 
-        # upgrading to 2.3.2 took about 80s
-        self.wait(80)
+        # after firmware-update finishes wait for reboot
+        self.wait(15)
         self.check_version()