diff --git a/cmd/substation/build.go b/cmd/substation/build.go
index a067bc42..407d7e01 100644
--- a/cmd/substation/build.go
+++ b/cmd/substation/build.go
@@ -12,6 +12,8 @@ func init() {
 	rootCmd.AddCommand(buildCmd)
 	buildCmd.PersistentFlags().BoolP("recursive", "R", false, "recursively build all files")
 	buildCmd.PersistentFlags().StringToString("ext-str", nil, "set external variables")
+	buildCmd.Flags().SortFlags = false
+	buildCmd.PersistentFlags().SortFlags = false
 }
 
 var buildCmd = &cobra.Command{
diff --git a/cmd/substation/fmt.go b/cmd/substation/fmt.go
index 7f6dffe9..24b9a04b 100644
--- a/cmd/substation/fmt.go
+++ b/cmd/substation/fmt.go
@@ -13,6 +13,8 @@ func init() {
 	rootCmd.AddCommand(fmtCmd)
 	fmtCmd.PersistentFlags().BoolP("write", "w", false, "write result to (source) file instead of stdout")
 	fmtCmd.PersistentFlags().BoolP("recursive", "R", false, "recursively format all files")
+	fmtCmd.Flags().SortFlags = false
+	fmtCmd.PersistentFlags().SortFlags = false
 }
 
 var fmtCmd = &cobra.Command{
diff --git a/cmd/substation/tap.go b/cmd/substation/tap.go
index 5c7d47b5..2a00a7d8 100644
--- a/cmd/substation/tap.go
+++ b/cmd/substation/tap.go
@@ -27,9 +27,11 @@ import (
 
 func init() {
 	rootCmd.AddCommand(tapCmd)
-	tapCmd.PersistentFlags().String("offset", "latest", "the offset to read from (earliest, latest)")
 	tapCmd.PersistentFlags().String("aws-kinesis-data-stream", "", "ARN of the Kinesis Data Stream to tap")
+	tapCmd.PersistentFlags().String("offset", "latest", "the offset to read from (earliest, latest)")
 	tapCmd.PersistentFlags().StringToString("ext-str", nil, "set external variables")
+	tapCmd.Flags().SortFlags = false
+	tapCmd.PersistentFlags().SortFlags = false
 }
 
 var tapCmd = &cobra.Command{
diff --git a/cmd/substation/test.go b/cmd/substation/test.go
index 6f68e8ef..7a47477c 100644
--- a/cmd/substation/test.go
+++ b/cmd/substation/test.go
@@ -32,6 +32,8 @@ func init() {
 	rootCmd.AddCommand(testCmd)
 	testCmd.PersistentFlags().BoolP("recursive", "R", false, "recursively test all files")
 	testCmd.PersistentFlags().StringToString("ext-str", nil, "set external variables")
+	testCmd.Flags().SortFlags = false
+	testCmd.PersistentFlags().SortFlags = false
 }
 
 func fiConfig(f string) (customConfig, error) {
diff --git a/cmd/substation/vet.go b/cmd/substation/vet.go
index 86d2ff7c..0f5a6969 100644
--- a/cmd/substation/vet.go
+++ b/cmd/substation/vet.go
@@ -16,6 +16,8 @@ func init() {
 	rootCmd.AddCommand(vetCmd)
 	vetCmd.PersistentFlags().BoolP("recursive", "R", false, "recursively vet all files")
 	vetCmd.PersistentFlags().StringToString("ext-str", nil, "set external variables")
+	vetCmd.Flags().SortFlags = false
+	vetCmd.PersistentFlags().SortFlags = false
 }
 
 // vetTransformRe captures the transform ID from a Substation error message.