diff --git a/pkg/app/master/cli_test.go b/pkg/app/master/cli_test.go
new file mode 100644
index 00000000..50291608
--- /dev/null
+++ b/pkg/app/master/cli_test.go
@@ -0,0 +1,22 @@
+package app
+
+import (
+	"github.com/mintoolkit/mint/pkg/app/master/signals"
+	"github.com/stretchr/testify/require"
+	"testing"
+)
+
+func TestCLI(t *testing.T) {
+	signals.InitHandlers()
+	cli := newCLI()
+
+	runArgs := [][]string{
+		{"mint", "--version"},
+		{"mint", "-v"},
+		{"mint", "help"},
+		{"mint", "-h"},
+	}
+	for _, args := range runArgs {
+		require.NoError(t, cli.Run(args))
+	}
+}
diff --git a/pkg/app/master/command/cliflags.go b/pkg/app/master/command/cliflags.go
index dac7a3bd..1a115d40 100644
--- a/pkg/app/master/command/cliflags.go
+++ b/pkg/app/master/command/cliflags.go
@@ -38,6 +38,7 @@ const (
 	FlagCRTIOInactivityTimeout   = "crt-io-inactivity-timeout"
 	FlagCRTSaveInactivityTimeout = "crt-save-inactivity-timeout"
 	FlagCRTCopyInactivityTimeout = "crt-copy-inactivity-timeout"
+	FlagHelp                     = "help"
 )
 
 const (
@@ -71,6 +72,7 @@ const (
 	FlagCRTIOInactivityTimeoutUsage   = "CRT I/O general inactivity timeout"
 	FlagCRTSaveInactivityTimeoutUsage = "CRT save image operation inactivity timeout (overrides the general I/O timeout)"
 	FlagCRTCopyInactivityTimeoutUsage = "CRT copy from container operation inactivity timeout (overrides the general I/O timeout)"
+	FlagHelpUsage                     = "Show help info"
 )
 
 // Shared command flag names
@@ -433,6 +435,11 @@ func GlobalFlags() []cli.Flag {
 			Usage:   FlagCRTCopyInactivityTimeoutUsage,
 			EnvVars: []string{"DSLIM_CRT_COPY_INACTIVITY_TIMEOUT"},
 		},
+		&cli.BoolFlag{
+			Name:    FlagHelp,
+			Aliases: []string{"h"},
+			Usage:   FlagHelpUsage,
+		},
 		&cli.StringFlag{
 			Name:  FlagStatePath,
 			Value: "",