diff --git a/runsc/cmd/boot.go b/runsc/cmd/boot.go
index 4b0f3b188a..6115614259 100644
--- a/runsc/cmd/boot.go
+++ b/runsc/cmd/boot.go
@@ -201,7 +201,7 @@ func (*Boot) Synopsis() string {
 
 // Usage implements subcommands.Command.Usage.
 func (*Boot) Usage() string {
-	return `boot [flags] <container id>`
+	return "boot [flags] <container id>\n"
 }
 
 // SetFlags implements subcommands.Command.SetFlags.
diff --git a/runsc/cmd/checkpoint.go b/runsc/cmd/checkpoint.go
index 6d28f6e453..a865bd72f4 100644
--- a/runsc/cmd/checkpoint.go
+++ b/runsc/cmd/checkpoint.go
@@ -55,8 +55,7 @@ func (*Checkpoint) Synopsis() string {
 
 // Usage implements subcommands.Command.Usage.
 func (*Checkpoint) Usage() string {
-	return `checkpoint [flags] <container id> - save current state of container.
-`
+	return "checkpoint [flags] <container id> - save current state of container.\n"
 }
 
 // SetFlags implements subcommands.Command.SetFlags.
diff --git a/runsc/cmd/create.go b/runsc/cmd/create.go
index b6d3dea541..54e156b19b 100644
--- a/runsc/cmd/create.go
+++ b/runsc/cmd/create.go
@@ -62,8 +62,7 @@ func (*Create) Synopsis() string {
 
 // Usage implements subcommands.Command.Usage.
 func (*Create) Usage() string {
-	return `create [flags] <container id> - create a secure container
-`
+	return "create [flags] <container id> - create a secure container\n"
 }
 
 // SetFlags implements subcommands.Command.SetFlags.
diff --git a/runsc/cmd/debug.go b/runsc/cmd/debug.go
index f3fffb8211..50d469f679 100644
--- a/runsc/cmd/debug.go
+++ b/runsc/cmd/debug.go
@@ -64,7 +64,7 @@ func (*Debug) Synopsis() string {
 
 // Usage implements subcommands.Command.
 func (*Debug) Usage() string {
-	return `debug [flags] <container id>`
+	return "debug [flags] <container id>\n"
 }
 
 // SetFlags implements subcommands.Command.
diff --git a/runsc/cmd/delete.go b/runsc/cmd/delete.go
index 42ee3d1a69..3a6a5fc927 100644
--- a/runsc/cmd/delete.go
+++ b/runsc/cmd/delete.go
@@ -45,7 +45,7 @@ func (*Delete) Synopsis() string {
 
 // Usage implements subcommands.Command.Usage.
 func (*Delete) Usage() string {
-	return `delete [flags] <container ids>`
+	return "delete [flags] <container ids>\n"
 }
 
 // SetFlags implements subcommands.Command.SetFlags.
diff --git a/runsc/cmd/gofer.go b/runsc/cmd/gofer.go
index adf3103881..91c3f40450 100644
--- a/runsc/cmd/gofer.go
+++ b/runsc/cmd/gofer.go
@@ -112,7 +112,7 @@ func (g *Gofer) Synopsis() string {
 
 // Usage implements subcommands.Command.
 func (*Gofer) Usage() string {
-	return `gofer [flags]`
+	return "gofer [flags]\n"
 }
 
 // SetFlags implements subcommands.Command.
diff --git a/runsc/cmd/install.go b/runsc/cmd/install.go
index bc3a8ace83..b7192bf59d 100644
--- a/runsc/cmd/install.go
+++ b/runsc/cmd/install.go
@@ -52,8 +52,7 @@ func (*Install) Synopsis() string {
 
 // Usage implements subcommands.Command.Usage.
 func (*Install) Usage() string {
-	return `install [--runtime=<name>] [flags] [-- [args...]] -- if provided, args are passed to the runtime
-`
+	return "install [--runtime=<name>] [flags] [-- [args...]] -- if provided, args are passed to the runtime\n"
 }
 
 // SetFlags implements subcommands.Command.SetFlags.
@@ -212,8 +211,7 @@ func (*Uninstall) Synopsis() string {
 
 // Usage implements subcommands.Command.Usage.
 func (*Uninstall) Usage() string {
-	return `uninstall [flags] <name>
-`
+	return "uninstall [flags] <name>\n"
 }
 
 // SetFlags implements subcommands.Command.SetFlags.
diff --git a/runsc/cmd/kill.go b/runsc/cmd/kill.go
index df28aab8a3..ae9a409002 100644
--- a/runsc/cmd/kill.go
+++ b/runsc/cmd/kill.go
@@ -46,7 +46,7 @@ func (*Kill) Synopsis() string {
 
 // Usage implements subcommands.Command.Usage.
 func (*Kill) Usage() string {
-	return `kill <container id> [signal]`
+	return "kill <container id> [signal]\n"
 }
 
 // SetFlags implements subcommands.Command.SetFlags.
diff --git a/runsc/cmd/list.go b/runsc/cmd/list.go
index 52eca4bfba..6a6197ea5f 100644
--- a/runsc/cmd/list.go
+++ b/runsc/cmd/list.go
@@ -51,7 +51,7 @@ func (*List) Synopsis() string {
 
 // Usage implements subcommands.Command.Usage.
 func (*List) Usage() string {
-	return `list [flags]`
+	return "list [flags]\n"
 }
 
 // SetFlags implements subcommands.Command.SetFlags.
diff --git a/runsc/cmd/metric_export.go b/runsc/cmd/metric_export.go
index 88fcf37a56..cf4a254165 100644
--- a/runsc/cmd/metric_export.go
+++ b/runsc/cmd/metric_export.go
@@ -47,8 +47,7 @@ func (*MetricExport) Synopsis() string {
 
 // Usage implements subcommands.Command.Usage.
 func (*MetricExport) Usage() string {
-	return `export-metrics [-exporter-prefix=<runsc_>] <container id> - prints sandbox metric data in Prometheus metric format
-`
+	return "export-metrics [-exporter-prefix=<runsc_>] <container id> - prints sandbox metric data in Prometheus metric format\n"
 }
 
 // SetFlags implements subcommands.Command.SetFlags.
diff --git a/runsc/cmd/metricserver/metricservercmd/metricservercmd.go b/runsc/cmd/metricserver/metricservercmd/metricservercmd.go
index e8ef15345d..eb52725caa 100644
--- a/runsc/cmd/metricserver/metricservercmd/metricservercmd.go
+++ b/runsc/cmd/metricserver/metricservercmd/metricservercmd.go
@@ -39,8 +39,7 @@ func (*Cmd) Synopsis() string {
 
 // Usage implements subcommands.Command.Usage.
 func (*Cmd) Usage() string {
-	return `-root=<root dir> -metric-server=<addr> metric-server [-exporter-prefix=<runsc_>]
-`
+	return "-root=<root dir> -metric-server=<addr> metric-server [-exporter-prefix=<runsc_>]\n"
 }
 
 // SetFlags implements subcommands.Command.SetFlags.
diff --git a/runsc/cmd/nvproxy/list_supported_drivers.go b/runsc/cmd/nvproxy/list_supported_drivers.go
index 903d513fef..684f11b0a3 100644
--- a/runsc/cmd/nvproxy/list_supported_drivers.go
+++ b/runsc/cmd/nvproxy/list_supported_drivers.go
@@ -39,8 +39,7 @@ func (*listSupportedDrivers) Synopsis() string {
 
 // Usage implements subcommands.Command.
 func (*listSupportedDrivers) Usage() string {
-	return `list-supported-drivers - list all nvidia driver versions supported by nvproxy
-`
+	return "list-supported-drivers - list all nvidia driver versions supported by nvproxy\n"
 }
 
 // SetFlags implements subcommands.Command.
diff --git a/runsc/cmd/pause.go b/runsc/cmd/pause.go
index 37e214fba9..b5505d7346 100644
--- a/runsc/cmd/pause.go
+++ b/runsc/cmd/pause.go
@@ -39,7 +39,7 @@ func (*Pause) Synopsis() string {
 
 // Usage implements subcommands.Command.Usage.
 func (*Pause) Usage() string {
-	return `pause <container id> - pause process in instance of container.`
+	return "pause <container id> - pause process in instance of container.\n"
 }
 
 // SetFlags implements subcommands.Command.SetFlags.
diff --git a/runsc/cmd/platforms.go b/runsc/cmd/platforms.go
index a68f125948..5cdcc21073 100644
--- a/runsc/cmd/platforms.go
+++ b/runsc/cmd/platforms.go
@@ -39,8 +39,7 @@ func (*Platforms) Synopsis() string {
 
 // Usage implements subcommands.Command.Usage.
 func (*Platforms) Usage() string {
-	return `platforms [options] - Print available platforms.
-`
+	return "platforms [options] - Print available platforms.\n"
 }
 
 // SetFlags implements subcommands.Command.SetFlags.
diff --git a/runsc/cmd/restore.go b/runsc/cmd/restore.go
index 0ecdb697cd..631f72098b 100644
--- a/runsc/cmd/restore.go
+++ b/runsc/cmd/restore.go
@@ -67,8 +67,7 @@ func (*Restore) Synopsis() string {
 
 // Usage implements subcommands.Command.Usage.
 func (*Restore) Usage() string {
-	return `restore [flags] <container id> - restore saved state of container.
-`
+	return "restore [flags] <container id> - restore saved state of container.\n"
 }
 
 // SetFlags implements subcommands.Command.SetFlags.
diff --git a/runsc/cmd/resume.go b/runsc/cmd/resume.go
index c2c465d5b0..bab411047a 100644
--- a/runsc/cmd/resume.go
+++ b/runsc/cmd/resume.go
@@ -39,8 +39,7 @@ func (*Resume) Synopsis() string {
 
 // Usage implements subcommands.Command.Usage.
 func (*Resume) Usage() string {
-	return `resume <container id> - resume a paused container.
-`
+	return "resume <container id> - resume a paused container.\n"
 }
 
 // SetFlags implements subcommands.Command.SetFlags.
diff --git a/runsc/cmd/run.go b/runsc/cmd/run.go
index ba4fa1aeae..5dcc1f584d 100644
--- a/runsc/cmd/run.go
+++ b/runsc/cmd/run.go
@@ -56,8 +56,7 @@ func (*Run) Synopsis() string {
 
 // Usage implements subcommands.Command.Usage.
 func (*Run) Usage() string {
-	return `run [flags] <container id> - create and run a secure container.
-`
+	return "run [flags] <container id> - create and run a secure container.\n"
 }
 
 // SetFlags implements subcommands.Command.SetFlags.
diff --git a/runsc/cmd/start.go b/runsc/cmd/start.go
index d66d7f4f3b..41a587a4de 100644
--- a/runsc/cmd/start.go
+++ b/runsc/cmd/start.go
@@ -40,7 +40,7 @@ func (*Start) Synopsis() string {
 
 // Usage implements subcommands.Command.Usage.
 func (*Start) Usage() string {
-	return `start <container id> - start a secure container.`
+	return "start <container id> - start a secure container.\n"
 }
 
 // SetFlags implements subcommands.Command.SetFlags.
diff --git a/runsc/cmd/state.go b/runsc/cmd/state.go
index 253b7314ac..ec8e3543b8 100644
--- a/runsc/cmd/state.go
+++ b/runsc/cmd/state.go
@@ -42,7 +42,7 @@ func (*State) Synopsis() string {
 
 // Usage implements subcommands.Command.Usage.
 func (*State) Usage() string {
-	return `state [flags] <container id> - get the state of a container`
+	return "state [flags] <container id> - get the state of a container\n"
 }
 
 // SetFlags implements subcommands.Command.SetFlags.
diff --git a/runsc/cmd/statefile.go b/runsc/cmd/statefile.go
index 180ecbd162..cdff0d8408 100644
--- a/runsc/cmd/statefile.go
+++ b/runsc/cmd/statefile.go
@@ -47,7 +47,7 @@ func (*Statefile) Synopsis() string {
 
 // Usage implements subcommands.Command.
 func (*Statefile) Usage() string {
-	return `statefile [flags] <statefile>`
+	return "statefile [flags] <statefile>\n"
 }
 
 // SetFlags implements subcommands.Command.
diff --git a/runsc/cmd/syscalls.go b/runsc/cmd/syscalls.go
index 06dec4ae12..84f72a7c3a 100644
--- a/runsc/cmd/syscalls.go
+++ b/runsc/cmd/syscalls.go
@@ -91,8 +91,7 @@ func (*Syscalls) Synopsis() string {
 
 // Usage implements subcommands.Command.Usage.
 func (*Syscalls) Usage() string {
-	return `syscalls [options] - Print compatibility information for syscalls.
-`
+	return "syscalls [options] - Print compatibility information for syscalls.\n"
 }
 
 // SetFlags implements subcommands.Command.SetFlags.
diff --git a/runsc/cmd/trace/create.go b/runsc/cmd/trace/create.go
index b236588ac3..f8ebd978a4 100644
--- a/runsc/cmd/trace/create.go
+++ b/runsc/cmd/trace/create.go
@@ -48,8 +48,7 @@ func (*create) Synopsis() string {
 
 // Usage implements subcommands.Command.
 func (*create) Usage() string {
-	return `create [flags] <sandbox id> - create a trace session
-`
+	return "create [flags] <sandbox id> - create a trace session\n"
 }
 
 // SetFlags implements subcommands.Command.
diff --git a/runsc/cmd/trace/delete.go b/runsc/cmd/trace/delete.go
index f4197437df..95db37a9a0 100644
--- a/runsc/cmd/trace/delete.go
+++ b/runsc/cmd/trace/delete.go
@@ -42,8 +42,7 @@ func (*delete) Synopsis() string {
 
 // Usage implements subcommands.Command.
 func (*delete) Usage() string {
-	return `delete [flags] <sandbox id> - delete a trace session
-`
+	return "delete [flags] <sandbox id> - delete a trace session\n"
 }
 
 // SetFlags implements subcommands.Command.
diff --git a/runsc/cmd/trace/list.go b/runsc/cmd/trace/list.go
index 190d28dca7..4cd72bc846 100644
--- a/runsc/cmd/trace/list.go
+++ b/runsc/cmd/trace/list.go
@@ -40,8 +40,7 @@ func (*list) Synopsis() string {
 
 // Usage implements subcommands.Command.
 func (*list) Usage() string {
-	return `list - list all trace sessions
-`
+	return "list - list all trace sessions\n"
 }
 
 // SetFlags implements subcommands.Command.
diff --git a/runsc/cmd/trace/metadata.go b/runsc/cmd/trace/metadata.go
index c3fe1d9edc..6d9ff7c45e 100644
--- a/runsc/cmd/trace/metadata.go
+++ b/runsc/cmd/trace/metadata.go
@@ -40,8 +40,7 @@ func (*metadata) Synopsis() string {
 
 // Usage implements subcommands.Command.
 func (*metadata) Usage() string {
-	return `metadata - list all trace points configuration information
-`
+	return "metadata - list all trace points configuration information\n"
 }
 
 // SetFlags implements subcommands.Command.
diff --git a/runsc/cmd/trace/procfs.go b/runsc/cmd/trace/procfs.go
index 58a79b048f..b850b8dec1 100644
--- a/runsc/cmd/trace/procfs.go
+++ b/runsc/cmd/trace/procfs.go
@@ -43,8 +43,7 @@ func (*procfs) Synopsis() string {
 
 // Usage implements subcommands.Command.
 func (*procfs) Usage() string {
-	return `procfs <sandbox id> - get procfs dump for a trace session
-`
+	return "procfs <sandbox id> - get procfs dump for a trace session\n"
 }
 
 // SetFlags implements subcommands.Command.
diff --git a/runsc/cmd/umount_unsafe.go b/runsc/cmd/umount_unsafe.go
index d479870432..552ec4d30e 100644
--- a/runsc/cmd/umount_unsafe.go
+++ b/runsc/cmd/umount_unsafe.go
@@ -44,7 +44,7 @@ func (*Umount) Synopsis() string {
 
 // Usage implements subcommands.Command.Usage.
 func (*Umount) Usage() string {
-	return `umount --sync-fd=FD <directory path>`
+	return "umount --sync-fd=FD <directory path>\n"
 }
 
 // SetFlags implements subcommands.Command.SetFlags.
diff --git a/runsc/cmd/usage.go b/runsc/cmd/usage.go
index 9c6005bff3..94d1cae7b6 100644
--- a/runsc/cmd/usage.go
+++ b/runsc/cmd/usage.go
@@ -43,8 +43,7 @@ func (*Usage) Synopsis() string {
 
 // Usage implements subcommands.Command.Usage.
 func (*Usage) Usage() string {
-	return `usage [flags] <container id> - print memory usages to standard output.
-`
+	return "usage [flags] <container id> - print memory usages to standard output.\n"
 }
 
 // SetFlags implements subcommands.Command.SetFlags.
diff --git a/runsc/cmd/wait.go b/runsc/cmd/wait.go
index eab74c283f..e5bfedf278 100644
--- a/runsc/cmd/wait.go
+++ b/runsc/cmd/wait.go
@@ -51,7 +51,7 @@ func (*Wait) Synopsis() string {
 
 // Usage implements subcommands.Command.Usage.
 func (*Wait) Usage() string {
-	return `wait [flags] <container id>`
+	return "wait [flags] <container id>\n"
 }
 
 // SetFlags implements subcommands.Command.SetFlags.