diff --git a/tests/integration/features/hints.feature b/tests/integration/features/hints.feature
index 1e3001c0b..b5959fe1b 100644
--- a/tests/integration/features/hints.feature
+++ b/tests/integration/features/hints.feature
@@ -45,7 +45,7 @@ Feature: Using hints
       Then no crash should happen
 
     Scenario: Using :hint spawn with flags and -- (issue 797)
-        When I open data/hints/simple.html
+        When I open data/hints/html/simple.html
         And I run :hint -- all spawn -v echo
         And I run :follow-hint a
         Then the message "Command exited successfully." should be shown
@@ -56,6 +56,25 @@ Feature: Using hints
         And I run :follow-hint a
         Then the message "Command exited successfully." should be shown
 
+    Scenario: Using :hint spawn with flags and --rapid (issue 797)
+        When I open data/hints/html/simple.html
+        And I run :hint --rapid all spawn -v echo
+        And I run :follow-hint a
+        Then the message "Command exited successfully." should be shown
+
+    Scenario: Using :hint run
+        When I open data/hints/html/simple.html
+        And I run :hint all run message-info {hint-url}
+        And I run :follow-hint a
+        Then the message "http://localhost:(port)/data/hello.txt" should be shown
+
+    Scenario: Using :hint fill
+        When I open data/hints/html/simple.html
+        And I run :hint all fill :message-info {hint-url}
+        And I run :follow-hint a
+        And I press the key "<Enter>"
+        Then the message "http://localhost:(port)/data/hello.txt" should be shown
+
     Scenario: Yanking to primary selection without it being supported (#1336)
         When selection is not supported
         And I run :debug-set-fake-clipboard