diff --git a/tests/integration/data/search.html b/tests/integration/data/search.html
index 4613e5b27..2eec560d6 100644
--- a/tests/integration/data/search.html
+++ b/tests/integration/data/search.html
@@ -14,6 +14,8 @@
             baz<br/>
             Baz<br/>
             BAZ<br/>
+            space travel<br/>
+            /slash<br/>
         </p>
     </body>
 </html>
diff --git a/tests/integration/features/search.feature b/tests/integration/features/search.feature
index 5d43a2190..9c661e469 100644
--- a/tests/integration/features/search.feature
+++ b/tests/integration/features/search.feature
@@ -27,6 +27,19 @@ Feature: Searching on a page
         When I run :search doesnotmatch
         Then the warning "Text 'doesnotmatch' not found on page!" should be shown
 
+    @skip
+    Scenario: Searching with / and spaces at the end (issue 874)
+        When I run :set-cmd-text -s /space
+        And I run :command-accept
+        And I run :yank-selected
+        Then the clipboard should contain "space "
+
+    Scenario: Searching with / and slash in search term (issue 507)
+        When I run :set-cmd-text -s //slash
+        And I run :command-accept
+        And I run :yank-selected
+        Then the clipboard should contain "/slash"
+
     # xfail takes a long time to timeout, and this doesn't work because this is
     # QtWebKit behaviour.
     @skip
@@ -89,6 +102,14 @@ Feature: Searching on a page
         And I run :search-next
         Then no crash should happen
 
+    Scenario: Repeating search in a second tab (issue #940)
+        When I open data/search.html in a new tab
+        And I run :search foo
+        And I run :tab-prev
+        And I run :search-next
+        And I run :yank-selected
+        Then the clipboard should contain "foo"
+
     ## :search-prev
 
     Scenario: Jumping to previous match