diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 7afacb3eb0..3fb9bf098c 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -2748,8 +2748,9 @@ class ListServer(command.Lister):
 
 class LockServer(command.Command):
 
-    _description = _("Lock server(s). A non-admin user will not be able to "
-                     "execute actions")
+    _description = _("""Lock server(s)
+
+A non-admin user will not be able to execute actions.""")
 
     def get_parser(self, prog_name):
         parser = super(LockServer, self).get_parser(prog_name)
@@ -4516,7 +4517,7 @@ class SshServer(command.Command):
 
 
 class StartServer(command.Command):
-    _description = _("Start server(s).")
+    _description = _("Start server(s)")
 
     def get_parser(self, prog_name):
         parser = super(StartServer, self).get_parser(prog_name)
@@ -4548,7 +4549,7 @@ class StartServer(command.Command):
 
 
 class StopServer(command.Command):
-    _description = _("Stop server(s).")
+    _description = _("Stop server(s)")
 
     def get_parser(self, prog_name):
         parser = super(StopServer, self).get_parser(prog_name)
diff --git a/openstackclient/tests/functional/common/test_help.py b/openstackclient/tests/functional/common/test_help.py
index c55741f19c..e84c22e00d 100644
--- a/openstackclient/tests/functional/common/test_help.py
+++ b/openstackclient/tests/functional/common/test_help.py
@@ -30,9 +30,7 @@ class HelpTests(base.TestCase):
         ('server image create',
          'Create a new server disk image from an existing server'),
         ('server list', 'List servers'),
-        ('server lock',
-         'Lock server(s). '
-         'A non-admin user will not be able to execute actions'),
+        ('server lock', 'Lock server(s)'),
         ('server migrate', 'Migrate server to different host'),
         ('server pause', 'Pause server(s)'),
         ('server reboot', 'Perform a hard or soft server reboot'),
@@ -46,8 +44,8 @@ class HelpTests(base.TestCase):
         ('server shelve', 'Shelve and optionally offload server(s)'),
         ('server show', 'Show server details'),
         ('server ssh', 'SSH to server'),
-        ('server start', 'Start server(s).'),
-        ('server stop', 'Stop server(s).'),
+        ('server start', 'Start server(s)'),
+        ('server stop', 'Stop server(s)'),
         ('server suspend', 'Suspend server(s)'),
         ('server unlock', 'Unlock server(s)'),
         ('server unpause', 'Unpause server(s)'),