diff --git a/lldb/test/help/TestHelp.py b/lldb/test/help/TestHelp.py
index 95bf816..4fe0c77 100644
--- a/lldb/test/help/TestHelp.py
+++ b/lldb/test/help/TestHelp.py
@@ -121,6 +121,13 @@
         self.expect("help watchpt-id-list",
             substrs = ['<watchpt-id-list>'])
 
+    def test_help_watchpoint_set(self):
+        """Test that 'help watchpoint set' prints out <expr> for the '-e' option
+        and <variable-name> for the '-v' option."""
+        self.expect("help watchpoint set",
+            patterns = ['watchpoint set -e.*<expr>',
+                        'watchpoint set -v.*<variable-name>'])
+
 
 if __name__ == '__main__':
     import atexit