diff --git a/test/help/default-test b/test/help/default-test
index 4e8f9377b..b9b3519de 100755
--- a/test/help/default-test
+++ b/test/help/default-test
@@ -109,9 +109,9 @@ External commands:
   ! ?git branch -D %(branch)
 [-] status bindings
 View-specific actions
-  u status-update     Stage/unstage chunk or file changes
-  ! status-revert     Revert chunk or file changes
-  M status-merge      Merge file using external tool
+  u status-update              Stage/unstage chunk or file changes
+  ! status-revert              Revert chunk or file changes
+  M status-merge               Merge file using external tool
 External commands:
   C !git commit
 [-] stage bindings
diff --git a/test/help/user-command-comment-test b/test/help/user-command-comment-test
new file mode 100755
index 000000000..20cbce130
--- /dev/null
+++ b/test/help/user-command-comment-test
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+. libtest.sh
+
+export TIGRC_SYSTEM=does-not-exist
+
+test_case user-command-comment \
+	--args='status' \
+	--tigrc="
+		bind generic : prompt # User comment for a builtin command is not exposed
+		bind generic , none # User comment does not interfere with a null binding
+		bind generic u1 !user
+		bind generic u2 !user # This is a user commentary for a simple user command
+		bind generic u3 !user 1 2 3 # This is a user commentary for a user command with parameters
+		bind generic u4 !user command with a long parameter list but no user commentary
+		" \
+	--script="
+		:bind generic p1 !true
+		:view-help
+		" \
+	<<EXPECTED_HELP_VIEW
+Quick reference for tig keybindings:
+ 
+[-] generic bindings
+Misc
+   : prompt      Open the prompt
+External commands:
+  u1 !user
+  u2 !user       This is a user commentary for a simple user command
+  u3 !user 1 2 3 This is a user commentary for a user command with parameters
+  u4 !user command with a long parameter list but no user commentary
+  p1 !true
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+[help] - line 1 of 11                                                       100%
+EXPECTED_HELP_VIEW
+
+run_test_cases
diff --git a/test/tigrc/parse-test b/test/tigrc/parse-test
index 2f73894fe..11362e939 100755
--- a/test/tigrc/parse-test
+++ b/test/tigrc/parse-test
@@ -115,7 +115,7 @@ Misc
    : prompt    Open the prompt
 [-] main bindings
 Internal commands:
-   # :/s e a r c h
+   # :/s e a r c h    Toggle option
 External commands:
    1 !external command
    2 @silent command