diff --git a/tests/end2end/features/completion.feature b/tests/end2end/features/completion.feature
index 1d54b131a..782fe1988 100644
--- a/tests/end2end/features/completion.feature
+++ b/tests/end2end/features/completion.feature
@@ -80,7 +80,9 @@ Feature: Using completion
         And I wait for "setting text = ':tab-select 0/2', *" in the log
         And I run :completion-item-del
         Then the following tabs should be open:
+            """
             - data/hello.txt (active)
+            """
 
     Scenario: Go to tab after moving a tab
         Given I have a fresh instance
diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature
index 710b90f04..fb22170d7 100644
--- a/tests/end2end/features/hints.feature
+++ b/tests/end2end/features/hints.feature
@@ -34,7 +34,9 @@ Feature: Using hints
         And I hint with args "links current" and follow a
         And I wait until data/hello.txt is loaded
         Then the following tabs should be open:
+            """
             - data/hello.txt (active)
+            """
 
     Scenario: Following a hint and allow to open in new tab.
         When I open data/hints/link_blank.html
@@ -58,7 +60,9 @@ Feature: Using hints
         And I hint with args "links current" and follow a
         And I wait until data/hello.txt is loaded
         Then the following tabs should be open:
+            """
             - data/hello.txt (active)
+            """
 
     Scenario: Entering and leaving hinting mode (issue 1464)
         When I open data/hints/html/simple.html
diff --git a/tests/end2end/features/history.feature b/tests/end2end/features/history.feature
index 8b53ad48d..27352df54 100644
--- a/tests/end2end/features/history.feature
+++ b/tests/end2end/features/history.feature
@@ -17,7 +17,9 @@ Feature: Page history
     Scenario: History item with title
         When I open data/title.html
         Then the history should contain:
+            """
             http://localhost:(port)/data/title.html Test title
+            """
 
     Scenario: History item with redirect
         When I open redirect-to?url=data/title.html without waiting
@@ -31,27 +33,35 @@ Feature: Page history
     Scenario: History item with spaces in URL
         When I open data/title with spaces.html
         Then the history should contain:
+            """
             http://localhost:(port)/data/title%20with%20spaces.html Test title
+            """
 
     @unicode_locale
     Scenario: History item with umlauts
         When I open data/äöü.html
         Then the history should contain:
+            """
             http://localhost:(port)/data/%C3%A4%C3%B6%C3%BC.html Chäschüechli
+            """
 
     @flaky @qtwebengine_todo  # Error page message is not implemented
     Scenario: History with an error
         When I run :open file:///does/not/exist
         And I wait for "Error while loading file:///does/not/exist: Error opening /does/not/exist: *" in the log
         Then the history should contain:
+            """
             file:///does/not/exist Error loading page: file:///does/not/exist
+            """
 
     @qtwebengine_todo  # Error page message is not implemented
     Scenario: History with a 404
         When I open 404 without waiting
         And I wait for "Error while loading http://localhost:*/404: NOT FOUND" in the log
         Then the history should contain:
+            """
             http://localhost:(port)/404 Error loading page: http://localhost:(port)/404
+            """
 
     Scenario: History with invalid URL
         When I run :tab-only
diff --git a/tests/end2end/features/invoke.feature b/tests/end2end/features/invoke.feature
index 14ce9c4bf..64d5a2e98 100644
--- a/tests/end2end/features/invoke.feature
+++ b/tests/end2end/features/invoke.feature
@@ -9,8 +9,10 @@ Feature: Invoking a new process
         And I open data/title.html
         And I open data/search.html as a URL
         Then the following tabs should be open:
+            """
             - data/title.html
             - data/search.html (active)
+            """
 
     Scenario: Using new_instance_open_target = tab-bg
         When I set new_instance_open_target to tab-bg
diff --git a/tests/end2end/features/javascript.feature b/tests/end2end/features/javascript.feature
index c3ec6ad8a..baba5b527 100644
--- a/tests/end2end/features/javascript.feature
+++ b/tests/end2end/features/javascript.feature
@@ -17,7 +17,9 @@ Feature: Javascript stuff
         And I wait for "[*] window closed" in the log
         Then "Focus object changed: *" should be logged
         And the following tabs should be open:
+            """
             - data/javascript/window_open.html (active)
+            """
 
     @skip   # Too flaky
     Scenario: Opening/closing a modal window via JS
@@ -31,7 +33,9 @@ Feature: Javascript stuff
         Then "Focus object changed: *" should be logged
         And "Web*Dialog requested, but we don't support that!" should be logged
         And the following tabs should be open:
+            """
             - data/javascript/window_open.html (active)
+            """
 
     # https://github.com/qutebrowser/qutebrowser/issues/906
 
diff --git a/tests/end2end/features/qutescheme.feature b/tests/end2end/features/qutescheme.feature
index f5b2aba2c..5c81a5072 100644
--- a/tests/end2end/features/qutescheme.feature
+++ b/tests/end2end/features/qutescheme.feature
@@ -11,7 +11,9 @@ Feature: Special qute:// pages
         And I run :help
         And I wait until qute://help/index.html is loaded
         Then the following tabs should be open:
+            """
             - qute://help/index.html (active)
+            """
 
     Scenario: :help with invalid topic
         When I run :help foo
@@ -23,7 +25,9 @@ Feature: Special qute:// pages
         And I run :help :back
         And I wait until qute://help/commands.html#back is loaded
         Then the following tabs should be open:
+            """
             - qute://help/commands.html#back (active)
+            """
 
     Scenario: :help with invalid command
         When I run :help :foo
@@ -35,7 +39,9 @@ Feature: Special qute:// pages
         And I run :help editor.command
         And I wait until qute://help/settings.html#editor.command is loaded
         Then the following tabs should be open:
+            """
             - qute://help/settings.html#editor.command (active)
+            """
 
     Scenario: :help with -t
         When the documentation is up to date
@@ -98,7 +104,9 @@ Feature: Special qute:// pages
         And I run :history
         And I wait until qute://history/ is loaded
         Then the following tabs should be open:
+            """
             - qute://history/ (active)
+            """
 
     Scenario: :history with -t
         When I run :tab-only
diff --git a/tests/end2end/features/scroll.feature b/tests/end2end/features/scroll.feature
index 73e897bcc..042f09735 100644
--- a/tests/end2end/features/scroll.feature
+++ b/tests/end2end/features/scroll.feature
@@ -305,7 +305,9 @@ Feature: Scrolling
         And I wait until the scroll position changed
         And I run :scroll-page --bottom-navigate next 0 1
         Then the following tabs should be open:
+            """
             - data/scroll/simple.html
+            """
 
     Scenario: :scroll-page with --top-navigate
         When I run :scroll-page --top-navigate prev 0 -1
diff --git a/tests/end2end/features/search.feature b/tests/end2end/features/search.feature
index 114ffecf9..48a013b25 100644
--- a/tests/end2end/features/search.feature
+++ b/tests/end2end/features/search.feature
@@ -355,7 +355,9 @@ Feature: Searching on a page
         And I wait for "search found foo" in the log
         And I run :selection-follow
         Then the following tabs should be open:
+            """
             - data/search.html (active)
+            """
 
     Scenario: Don't follow searched text in a new tab
         When I run :window-only
@@ -363,7 +365,9 @@ Feature: Searching on a page
         And I wait for "search found foo" in the log
         And I run :selection-follow -t
         Then the following tabs should be open:
+            """
             - data/search.html (active)
+            """
 
     Scenario: Follow a manually selected link
         When I run :jseval --file (testdata)/search_select.js
diff --git a/tests/end2end/features/tabs.feature b/tests/end2end/features/tabs.feature
index c166139a7..250828b3b 100644
--- a/tests/end2end/features/tabs.feature
+++ b/tests/end2end/features/tabs.feature
@@ -164,7 +164,9 @@ Feature: Tab management
         And I open data/numbers/3.txt in a new tab
         And I run :tab-only
         Then the following tabs should be open:
+            """
             - data/numbers/3.txt (active)
+            """
 
     Scenario: :tab-only with --prev
         When I open data/numbers/1.txt
@@ -937,7 +939,9 @@ Feature: Tab management
         And I run :undo
         And I wait until data/hello.txt is loaded
         Then the following tabs should be open:
+            """
             - data/hello.txt (active)
+            """
 
     @qtwebengine_flaky
     Scenario: Undo with auto-created last tab, with history
@@ -950,7 +954,9 @@ Feature: Tab management
         And I run :undo
         And I wait until data/hello2.txt is loaded
         Then the following tabs should be open:
+            """
             - data/hello2.txt (active)
+            """
 
     Scenario: Undo with auto-created last tab (startpage)
         When I open data/hello.txt
@@ -962,7 +968,9 @@ Feature: Tab management
         And I run :undo
         And I wait until data/hello.txt is loaded
         Then the following tabs should be open:
+            """
             - data/hello.txt (active)
+            """
 
     Scenario: Undo with auto-created last tab (default-page)
         When I open data/hello.txt
@@ -974,7 +982,9 @@ Feature: Tab management
         And I run :undo
         And I wait until data/hello.txt is loaded
         Then the following tabs should be open:
+            """
             - data/hello.txt (active)
+            """
 
     @skip  # Too flaky
     Scenario: Double-undo with single tab on tabs.last_close default page
@@ -1201,7 +1211,9 @@ Feature: Tab management
         And I run :tab-close
         And I wait until about:blank is loaded
         Then the following tabs should be open:
+            """
             - about:blank (active)
+            """
 
     Scenario: tabs.last_close = startpage
         When I set url.start_pages to ["http://localhost:(port)/data/numbers/7.txt", "http://localhost:(port)/data/numbers/8.txt"]
@@ -1225,7 +1237,9 @@ Feature: Tab management
         And I run :tab-close
         And I wait until data/numbers/9.txt is loaded
         Then the following tabs should be open:
+            """
             - data/numbers/9.txt (active)
+            """
 
     Scenario: tabs.last_close = close
         When I open data/hello.txt
@@ -1481,13 +1495,17 @@ Feature: Tab management
         When I open data/title.html
         And I run :tab-select /
         Then the following tabs should be open:
+            """
             - data/title.html (active)
+            """
 
     Scenario: :tab-select with wrong argument (//)
         When I open data/title.html
         And I run :tab-select //
         Then the following tabs should be open:
+            """
             - data/title.html (active)
+            """
 
     Scenario: :tab-select with wrong argument (0/x)
         When I open data/title.html
@@ -1746,7 +1764,9 @@ Feature: Tab management
         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) (pinned)
+            """
 
     Scenario: Pinned :tab-close prompt no
         When I open data/numbers/1.txt
@@ -1772,7 +1792,9 @@ Feature: Tab management
         And I wait for "*want to close pinned tabs*" in the log
         And I run :prompt-accept yes
         Then the following tabs should be open:
+            """
             - data/numbers/1.txt (active) (pinned)
+            """
 
     Scenario: Pinned :tab-only prompt no
         When I open data/numbers/1.txt
@@ -1795,7 +1817,9 @@ Feature: Tab management
         And I run :tab-pin
         And I run :tab-only
         Then the following tabs should be open:
+            """
             - data/numbers/2.txt (active) (pinned)
+            """
 
     Scenario: Pinned :tab-only --pinned close
         When I open data/numbers/1.txt
@@ -1805,7 +1829,9 @@ Feature: Tab management
         And I run :tab-next
         And I run :tab-only --pinned close
         Then the following tabs should be open:
+            """
             - data/numbers/1.txt (active) (pinned)
+            """
 
     Scenario: Pinned :tab-only --pinned keep
         When I open data/numbers/1.txt
@@ -1846,7 +1872,9 @@ Feature: Tab management
         And I run :tab-pin
         And I open data/numbers/2.txt
         Then the following tabs should be open:
+            """
             - data/numbers/2.txt (active) (pinned)
+            """
 
     Scenario: :home on a pinned tab
         When I open data/numbers/1.txt
@@ -1854,7 +1882,9 @@ Feature: Tab management
         And I run :home
         Then the message "Tab is pinned!" should be shown
         And the following tabs should be open:
+            """
             - data/numbers/1.txt (active) (pinned)
+            """
 
     Scenario: :home on a pinned tab with tabs.pinned.frozen = false
         When I set url.start_pages to ["http://localhost:(port)/data/numbers/2.txt"]
@@ -1864,7 +1894,9 @@ Feature: Tab management
         And I run :home
         Then data/numbers/2.txt should be loaded
         And the following tabs should be open:
+            """
             - data/numbers/2.txt (active) (pinned)
+            """
 
     Scenario: Cloning a pinned tab
         When I open data/numbers/1.txt
diff --git a/tests/end2end/features/urlmarks.feature b/tests/end2end/features/urlmarks.feature
index ec839fb53..5776b47d8 100644
--- a/tests/end2end/features/urlmarks.feature
+++ b/tests/end2end/features/urlmarks.feature
@@ -34,7 +34,9 @@ Feature: quickmarks and bookmarks
         And I run :bookmark-load http://localhost:(port)/data/numbers/1.txt
         Then data/numbers/1.txt should be loaded
         And the following tabs should be open:
+            """
             - data/numbers/1.txt (active)
+            """
 
     Scenario: Loading a bookmark in a new tab
         Given I open about:blank
@@ -174,7 +176,9 @@ Feature: quickmarks and bookmarks
         And I run :quickmark-load thirteen
         Then data/numbers/13.txt should be loaded
         And the following tabs should be open:
+            """
             - data/numbers/13.txt (active)
+            """
 
     Scenario: Loading a quickmark in a new tab
         Given I open about:blank