diff --git a/cmd/ctr/version.go b/cmd/ctr/commands/version/version.go
similarity index 79%
rename from cmd/ctr/version.go
rename to cmd/ctr/commands/version/version.go
index a937eb65a..4058d862d 100644
--- a/cmd/ctr/version.go
+++ b/cmd/ctr/commands/version/version.go
@@ -1,21 +1,19 @@
-package main
+package version
 
 import (
 	"fmt"
 	"os"
 
 	"github.com/containerd/containerd/cmd/ctr/commands"
-	"github.com/containerd/containerd/version"
+	"github.com/google/cadvisor/version"
 	"github.com/urfave/cli"
 )
 
-var versionCommand = cli.Command{
+// Command is a cli ommand to output the client and containerd server version
+var Command = cli.Command{
 	Name:  "version",
-	Usage: "print the version",
+	Usage: "print the client and server versions",
 	Action: func(context *cli.Context) error {
-		if context.NArg() > 0 {
-			return fmt.Errorf("no argument expected")
-		}
 		fmt.Println("Client:")
 		fmt.Printf("  Version: %s\n", version.Version)
 		fmt.Printf("  Revision: %s\n", version.Revision)
@@ -29,7 +27,6 @@ var versionCommand = cli.Command{
 		if err != nil {
 			return err
 		}
-
 		fmt.Println("Server:")
 		fmt.Printf("  Version: %s\n", v.Version)
 		fmt.Printf("  Revision: %s\n", v.Revision)
diff --git a/cmd/ctr/main.go b/cmd/ctr/main.go
index 35e8eafb5..e486b119f 100644
--- a/cmd/ctr/main.go
+++ b/cmd/ctr/main.go
@@ -6,6 +6,7 @@ import (
 	"log"
 	"os"
 
+	versionCmd "github.com/containerd/containerd/cmd/ctr/commands/version"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/server"
 	"github.com/containerd/containerd/version"
@@ -81,7 +82,7 @@ containerd CLI
 		snapshotCommand,
 		tasksCommand,
 		pluginsCommand,
-		versionCommand,
+		versionCmd.Command,
 	}, extraCmds...)
 	app.Before = func(context *cli.Context) error {
 		if context.GlobalBool("debug") {