diff --git a/tests/end2end/features/open.feature b/tests/end2end/features/open.feature
index 6a9daeabb..45012e639 100644
--- a/tests/end2end/features/open.feature
+++ b/tests/end2end/features/open.feature
@@ -43,31 +43,18 @@ Feature: Opening pages
         When I run :tab-only
         And I run :open -t http://localhost:(port)/data/numbers/4.txt
         And I wait until data/numbers/4.txt is loaded
-        Then the session should look like:
-            windows:
-            - tabs:
-              - history:
-                - url: about:blank
-              - active: true
-                history:
-                - active: true
-                  url: http://localhost:*/data/numbers/4.txt
+        Then the following tabs should be open:
+            - about:blank
+            - data/numbers/4.txt (active)
 
     Scenario: Opening in a new background tab
         Given I open about:blank
         When I run :tab-only
         And I run :open -b http://localhost:(port)/data/numbers/5.txt
         And I wait until data/numbers/5.txt is loaded
-        Then the session should look like:
-            windows:
-            - tabs:
-              - active: true
-                history:
-                - active: true
-                  url: about:blank
-              - history:
-                - active: true
-                  url: http://localhost:*/data/numbers/5.txt
+        Then the following tabs should be open:
+            - about:blank (active)
+            - data/numbers/5.txt
 
     Scenario: :open with count
         Given I open about:blank
@@ -86,11 +73,33 @@ Feature: Opening pages
                 - active: true
                   url: http://localhost:*/data/numbers/6.txt
 
+    Scenario: Opening in a new tab (explicit)
+        Given I open about:blank
+        When I set tabs -> new-tab-position-explicit to right
+        And I set tabs -> new-tab-position to left
+        And I run :tab-only
+        And I run :open -t http://localhost:(port)/data/numbers/7.txt
+        And I wait until data/numbers/7.txt is loaded
+        Then the following tabs should be open:
+            - about:blank
+            - data/numbers/7.txt (active)
+
+    Scenario: Opening in a new tab (implicit)
+        Given I open about:blank
+        When I set tabs -> new-tab-position-explicit to right
+        And I set tabs -> new-tab-position to left
+        And I run :tab-only
+        And I run :open -t -i http://localhost:(port)/data/numbers/8.txt
+        And I wait until data/numbers/8.txt is loaded
+        Then the following tabs should be open:
+            - data/numbers/8.txt (active)
+            - about:blank
+
     Scenario: Opening in a new window
         Given I open about:blank
         When I run :tab-only
-        And I run :open -w http://localhost:(port)/data/numbers/7.txt
-        And I wait until data/numbers/7.txt is loaded
+        And I run :open -w http://localhost:(port)/data/numbers/9.txt
+        And I wait until data/numbers/9.txt is loaded
         Then the session should look like:
             windows:
             - tabs:
@@ -99,46 +108,12 @@ Feature: Opening pages
                 - active: true
                   url: about:blank
             - tabs:
-              - active: true
-                history:
-                - active: true
-                  url: http://localhost:*/data/numbers/7.txt
-
-    Scenario: Opening a quickmark
-        When I run :quickmark-add http://localhost:(port)/data/numbers/8.txt quickmarktest
-        And I run :open quickmarktest
-        Then data/numbers/8.txt should be loaded
-
-    Scenario: :open with URL (explicit)
-        Given I open about:blank
-        When I set tabs -> new-tab-position-explicit to right
-        And I set tabs -> new-tab-position to left
-        And I run :tab-only
-        And I run :open -t http://localhost:(port)/data/numbers/9.txt
-        And I wait until data/numbers/9.txt is loaded
-        Then the session should look like:
-            windows:
-            - tabs:
-              - history:
-                - url: about:blank
               - active: true
                 history:
                 - active: true
                   url: http://localhost:*/data/numbers/9.txt
 
-    Scenario: :open with URL (implicit)
-        Given I open about:blank
-        When I set tabs -> new-tab-position-explicit to right
-        And I set tabs -> new-tab-position to left
-        And I run :tab-only
-        And I run :open -t -i http://localhost:(port)/data/numbers/10.txt
-        And I wait until data/numbers/10.txt is loaded
-        Then the session should look like:
-            windows:
-            - tabs:
-              - active: true
-                history:
-                - active: true
-                  url: http://localhost:*/data/numbers/10.txt
-              - history:
-                - url: about:blank
+    Scenario: Opening a quickmark
+        When I run :quickmark-add http://localhost:(port)/data/numbers/10.txt quickmarktest
+        And I run :open quickmarktest
+        Then data/numbers/10.txt should be loaded