diff --git a/commands.go b/commands.go
index b9daccfb0e..88d99df82b 100644
--- a/commands.go
+++ b/commands.go
@@ -31,6 +31,29 @@ func init() {
 	meta := command.Meta{Ui: ui}
 
 	Commands = map[string]cli.CommandFactory{
+		"init": func() (cli.Command, error) {
+			return &command.InitCommand{
+				Meta: meta,
+			}, nil
+		},
+
+		"server": func() (cli.Command, error) {
+			return &command.ServerCommand{
+				Meta: meta,
+				AuditBackends: map[string]audit.Factory{
+					"file": auditFile.Factory,
+				},
+				CredentialBackends: map[string]logical.Factory{
+					"app-id": credAppId.Factory,
+					"github": credGitHub.Factory,
+				},
+				LogicalBackends: map[string]logical.Factory{
+					"aws":    aws.Factory,
+					"consul": consul.Factory,
+				},
+			}, nil
+		},
+
 		"help": func() (cli.Command, error) {
 			return &command.HelpCommand{
 				Meta: meta,
@@ -112,29 +135,6 @@ func init() {
 			}, nil
 		},
 
-		"init": func() (cli.Command, error) {
-			return &command.InitCommand{
-				Meta: meta,
-			}, nil
-		},
-
-		"server": func() (cli.Command, error) {
-			return &command.ServerCommand{
-				Meta: meta,
-				AuditBackends: map[string]audit.Factory{
-					"file": auditFile.Factory,
-				},
-				CredentialBackends: map[string]logical.Factory{
-					"app-id": credAppId.Factory,
-					"github": credGitHub.Factory,
-				},
-				LogicalBackends: map[string]logical.Factory{
-					"aws":    aws.Factory,
-					"consul": consul.Factory,
-				},
-			}, nil
-		},
-
 		"mount": func() (cli.Command, error) {
 			return &command.MountCommand{
 				Meta: meta,