diff --git a/cli/command/formatter/history_test.go b/cli/command/formatter/history_test.go
index ce80dc9b8b..97ebcfdde1 100644
--- a/cli/command/formatter/history_test.go
+++ b/cli/command/formatter/history_test.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"bytes"
+
 	"github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/pkg/stringutils"
diff --git a/client/image_search_test.go b/client/image_search_test.go
index b17bbd8343..a64e0c458b 100644
--- a/client/image_search_test.go
+++ b/client/image_search_test.go
@@ -11,6 +11,7 @@ import (
 	"golang.org/x/net/context"
 
 	"encoding/json"
+
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/registry"
diff --git a/client/utils.go b/client/utils.go
index 23d520ecb8..f3d8877df7 100644
--- a/client/utils.go
+++ b/client/utils.go
@@ -1,9 +1,10 @@
 package client
 
 import (
-	"github.com/docker/docker/api/types/filters"
 	"net/url"
 	"regexp"
+
+	"github.com/docker/docker/api/types/filters"
 )
 
 var headerRegexp = regexp.MustCompile(`\ADocker/.+\s\((.+)\)\z`)
diff --git a/gometalinter.json b/gometalinter.json
index 4e10e547f5..c3ae185dbd 100644
--- a/gometalinter.json
+++ b/gometalinter.json
@@ -4,5 +4,5 @@
   "Exclude": ["cli/compose/schema/bindata.go"],
 
   "DisableAll": true,
-  "Enable": ["gofmt", "vet", "golint"]
+  "Enable": ["gofmt", "vet", "golint", "goimports"]
 }