diff --git a/docker/docker.go b/docker/docker.go
index 179b56f633..236742debf 100644
--- a/docker/docker.go
+++ b/docker/docker.go
@@ -3,7 +3,6 @@ package main
 import (
 	"fmt"
 	"os"
-	"sort"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/api/client"
@@ -36,9 +35,6 @@ func main() {
 
 		help := "\nCommands:\n"
 
-		// TODO(tiborvass): no need to sort if we ensure dockerCommands is sorted
-		sort.Sort(byName(dockerCommands))
-
 		for _, cmd := range dockerCommands {
 			help += fmt.Sprintf("    %-10.10s%s\n", cmd.name, cmd.description)
 		}
diff --git a/docker/flags.go b/docker/flags.go
index 34567bb332..afff0bd9bc 100644
--- a/docker/flags.go
+++ b/docker/flags.go
@@ -40,8 +40,8 @@ var dockerCommands = []command{
 	{"login", "Register or log in to a Docker registry"},
 	{"logout", "Log out from a Docker registry"},
 	{"logs", "Fetch the logs of a container"},
-	{"port", "List port mappings or a specific mapping for the CONTAINER"},
 	{"pause", "Pause all processes within a container"},
+	{"port", "List port mappings or a specific mapping for the CONTAINER"},
 	{"ps", "List containers"},
 	{"pull", "Pull an image or a repository from a registry"},
 	{"push", "Push an image or a repository to a registry"},
diff --git a/docker/flags_test.go b/docker/flags_test.go
new file mode 100644
index 0000000000..28021ba4c9
--- /dev/null
+++ b/docker/flags_test.go
@@ -0,0 +1,13 @@
+package main
+
+import (
+	"sort"
+	"testing"
+)
+
+// Tests if the subcommands of docker are sorted
+func TestDockerSubcommandsAreSorted(t *testing.T) {
+	if !sort.IsSorted(byName(dockerCommands)) {
+		t.Fatal("Docker subcommands are not in sorted order")
+	}
+}