diff --git a/registry/auth/silly/access.go b/registry/auth/silly/access.go
index 7d3a4d40d..20448efda 100644
--- a/registry/auth/silly/access.go
+++ b/registry/auth/silly/access.go
@@ -12,8 +12,8 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/docker/distribution/registry/auth"
 	ctxu "github.com/docker/distribution/context"
+	"github.com/docker/distribution/registry/auth"
 	"golang.org/x/net/context"
 )
 
diff --git a/registry/auth/token/accesscontroller.go b/registry/auth/token/accesscontroller.go
index 61b275a70..cb23eab60 100644
--- a/registry/auth/token/accesscontroller.go
+++ b/registry/auth/token/accesscontroller.go
@@ -11,8 +11,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/docker/distribution/registry/auth"
 	ctxu "github.com/docker/distribution/context"
+	"github.com/docker/distribution/registry/auth"
 	"github.com/docker/libtrust"
 	"golang.org/x/net/context"
 )
diff --git a/registry/client/client.go b/registry/client/client.go
index c697e01ce..8e868c418 100644
--- a/registry/client/client.go
+++ b/registry/client/client.go
@@ -9,9 +9,9 @@ import (
 	"regexp"
 	"strconv"
 
-	"github.com/docker/distribution/registry/api/v2"
 	"github.com/docker/distribution/digest"
 	"github.com/docker/distribution/manifest"
+	"github.com/docker/distribution/registry/api/v2"
 )
 
 // Client implements the client interface to the registry http api
diff --git a/registry/handlers/context.go b/registry/handlers/context.go
index a49253eea..0d3f44cc0 100644
--- a/registry/handlers/context.go
+++ b/registry/handlers/context.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/docker/distribution/registry/api/v2"
 	ctxu "github.com/docker/distribution/context"
 	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/registry/api/v2"
 	"github.com/docker/distribution/registry/storage"
 	"golang.org/x/net/context"
 )
diff --git a/registry/handlers/images.go b/registry/handlers/images.go
index 6a0e9a40a..e41f36822 100644
--- a/registry/handlers/images.go
+++ b/registry/handlers/images.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/docker/distribution/registry/api/v2"
 	ctxu "github.com/docker/distribution/context"
 	"github.com/docker/distribution/digest"
 	"github.com/docker/distribution/manifest"
+	"github.com/docker/distribution/registry/api/v2"
 	"github.com/docker/distribution/registry/storage"
 	"github.com/gorilla/handlers"
 )
diff --git a/registry/handlers/layer.go b/registry/handlers/layer.go
index 8214fbf0c..105c29640 100644
--- a/registry/handlers/layer.go
+++ b/registry/handlers/layer.go
@@ -3,9 +3,9 @@ package handlers
 import (
 	"net/http"
 
-	"github.com/docker/distribution/registry/api/v2"
 	ctxu "github.com/docker/distribution/context"
 	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/registry/api/v2"
 	"github.com/docker/distribution/registry/storage"
 	"github.com/gorilla/handlers"
 )
diff --git a/registry/handlers/layerupload.go b/registry/handlers/layerupload.go
index 83ef6fb6c..237644ea8 100644
--- a/registry/handlers/layerupload.go
+++ b/registry/handlers/layerupload.go
@@ -7,9 +7,9 @@ import (
 	"net/url"
 	"os"
 
-	"github.com/docker/distribution/registry/api/v2"
 	ctxu "github.com/docker/distribution/context"
 	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/registry/api/v2"
 	"github.com/docker/distribution/registry/storage"
 	"github.com/gorilla/handlers"
 )