diff --git a/python/src/trezorlib/debuglink.py b/python/src/trezorlib/debuglink.py
index b7427e300..fdb009c49 100644
--- a/python/src/trezorlib/debuglink.py
+++ b/python/src/trezorlib/debuglink.py
@@ -1120,6 +1120,14 @@ class TrezorClientDebugLink(TrezorClient):
             # If no other exception was raised, evaluate missed responses
             # (raises AssertionError on mismatch)
             self._verify_responses(expected_responses, actual_responses)
+            if isinstance(input_flow, Generator):
+                # Ensure that the input flow is exhausted
+                try:
+                    input_flow.throw(
+                        AssertionError("input flow continues past end of test")
+                    )
+                except StopIteration:
+                    pass
 
         elif isinstance(input_flow, Generator):
             # Propagate the exception through the input flow, so that we see in
diff --git a/tests/input_flows.py b/tests/input_flows.py
index 89a1e4ce6..5438237c4 100644
--- a/tests/input_flows.py
+++ b/tests/input_flows.py
@@ -99,8 +99,10 @@ class InputFlowSetupDevicePINWIpeCode(InputFlowBase):
         self.debug.press_yes()
 
         if self.model() is models.T2B1:
-            yield from swipe_if_necessary(self.debug)  # wipe code info
-            self.debug.press_yes()
+            layout = self.debug.read_layout()
+            if not "PinKeyboard" in layout.all_components():
+                yield from swipe_if_necessary(self.debug)  # wipe code info
+                self.debug.press_yes()
 
         yield  # enter current pin
         self.debug.input(self.pin)
@@ -128,8 +130,10 @@ class InputFlowNewCodeMismatch(InputFlowBase):
         self.debug.press_yes()
 
         if self.model() is models.T2B1:
-            yield from swipe_if_necessary(self.debug)  # code info
-            self.debug.press_yes()
+            layout = self.debug.read_layout()
+            if not "PinKeyboard" in layout.all_components():
+                yield from swipe_if_necessary(self.debug)  # code info
+                self.debug.press_yes()
 
         def input_two_different_pins() -> BRGeneratorType:
             yield from self.PIN.setup_new_pin(self.first_code, self.second_code)
@@ -711,8 +715,6 @@ class InputFlowPaymentRequestDetails(InputFlowBase):
 
         yield  # confirm transaction
         self.debug.press_yes()
-        yield  # confirm transaction
-        self.debug.press_yes()
 
     def input_flow_t3t1(self) -> BRGeneratorType:
         yield  # request to see details
@@ -1065,9 +1067,6 @@ def lock_time_input_flow_tt(
 
     yield  # confirm transaction
     debug.press_yes()
-    if double_confirm:
-        yield  # confirm transaction
-        debug.press_yes()
 
 
 def lock_time_input_flow_tr(
@@ -1124,17 +1123,13 @@ class InputFlowLockTimeBlockHeight(InputFlowBase):
         assert self.block_height in layout_text
 
     def input_flow_tt(self) -> BRGeneratorType:
-        yield from lock_time_input_flow_tt(
-            self.debug, self.assert_func, double_confirm=True
-        )
+        yield from lock_time_input_flow_tt(self.debug, self.assert_func)
 
     def input_flow_tr(self) -> BRGeneratorType:
         yield from lock_time_input_flow_tr(self.debug, self.assert_func)
 
     def input_flow_t3t1(self) -> BRGeneratorType:
-        yield from lock_time_input_flow_t3t1(
-            self.debug, self.assert_func, double_confirm=True
-        )
+        yield from lock_time_input_flow_t3t1(self.debug, self.assert_func)
 
 
 class InputFlowLockTimeDatetime(InputFlowBase):
diff --git a/tests/input_flows_helpers.py b/tests/input_flows_helpers.py
index 0538af3cf..b20fc4208 100644
--- a/tests/input_flows_helpers.py
+++ b/tests/input_flows_helpers.py
@@ -23,9 +23,10 @@ class PinFlow:
         self.debug.input(pin)
         if self.client.model is models.T2B1:
             yield  # Reenter PIN
-            TR.assert_in(
-                self.debug.read_layout().text_content(), "pin__reenter_to_confirm"
-            )
+            # todo update for wipe code
+            # TR.assert_in(
+            #     self.debug.read_layout().text_content(), "pin__reenter_to_confirm"
+            # )
             self.debug.press_yes()
         yield  # Enter PIN again
         assert "PinKeyboard" in self.debug.read_layout().all_components()
@@ -490,7 +491,6 @@ class EthereumFlow:
                 )
                 self.debug.press_no()
             self.debug.press_yes()
-            yield
         else:
             # confirm intro
             if info:
@@ -519,4 +519,3 @@ class EthereumFlow:
                 self.debug.press_left()
                 self.debug.press_left()
             self.debug.press_middle()
-            yield