diff --git a/tests/end2end/features/tabs.feature b/tests/end2end/features/tabs.feature
index a2e903001..5a7967b3a 100644
--- a/tests/end2end/features/tabs.feature
+++ b/tests/end2end/features/tabs.feature
@@ -1048,7 +1048,7 @@ Feature: Tab management
         And I open data/numbers/2.txt in a new tab
         And I run :tab-pin
         And I run :tab-close
-        And I wait for a prompt
+        And I wait for "*want to close a pinned tab*" in the log
         And I run :prompt-accept yes
         Then the following tabs should be open:
             - data/numbers/1.txt (active)
@@ -1059,7 +1059,7 @@ Feature: Tab management
         And I open data/numbers/2.txt in a new tab
         And I run :tab-pin
         And I run :tab-close
-        And I wait for a prompt
+        And I wait for "*want to close a pinned tab*" in the log
         And I run :prompt-accept no
         Then the following tabs should be open:
             - data/numbers/1.txt
diff --git a/tests/end2end/features/test_tabs_bdd.py b/tests/end2end/features/test_tabs_bdd.py
index d53241288..bcae6d60d 100644
--- a/tests/end2end/features/test_tabs_bdd.py
+++ b/tests/end2end/features/test_tabs_bdd.py
@@ -19,8 +19,3 @@
 
 import pytest_bdd as bdd
 bdd.scenarios('tabs.feature')
-
-
-@bdd.when("I wait for a prompt")
-def wait_for_prompt(quteproc):
-    quteproc.wait_for(message='Asking question *')