diff --git a/registry/storage/blob_test.go b/registry/storage/blob_test.go
index 6e7096d6..cce232a7 100644
--- a/registry/storage/blob_test.go
+++ b/registry/storage/blob_test.go
@@ -17,7 +17,6 @@ import (
 	"github.com/docker/distribution/registry/storage/driver/testdriver"
 	"github.com/docker/distribution/testutil"
 	"github.com/opencontainers/go-digest"
-	"path"
 )
 
 // TestWriteSeek tests that the current file size can be
diff --git a/registry/storage/driver/gcs/gcs.go b/registry/storage/driver/gcs/gcs.go
index c1ede991..c328c0ef 100644
--- a/registry/storage/driver/gcs/gcs.go
+++ b/registry/storage/driver/gcs/gcs.go
@@ -73,7 +73,7 @@ type driverParameters struct {
 	// pushes by ensuring we aren't DoSing our own server with many
 	// connections.
 	maxConcurrency uint64
-	projectID     string
+	projectID      string
 }
 
 func init() {
@@ -212,7 +212,7 @@ func FromParameters(parameters map[string]interface{}) (storagedriver.StorageDri
 		client:         oauth2.NewClient(context.Background(), ts),
 		chunkSize:      chunkSize,
 		maxConcurrency: maxConcurrency,
-		projectID:     fmt.Sprint(key.ProjectID),
+		projectID:      fmt.Sprint(key.ProjectID),
 	}
 
 	return New(params)
diff --git a/registry/storage/driver/gcs/gcs_test.go b/registry/storage/driver/gcs/gcs_test.go
index 64b77b08..f94ccfcc 100644
--- a/registry/storage/driver/gcs/gcs_test.go
+++ b/registry/storage/driver/gcs/gcs_test.go
@@ -6,10 +6,8 @@ import (
 	"os"
 	"testing"
 
-	dcontext "github.com/docker/distribution/context"
-	"fmt"
-
 	ctx "github.com/docker/distribution/context"
+	dcontext "github.com/docker/distribution/context"
 	storagedriver "github.com/docker/distribution/registry/storage/driver"
 	"github.com/docker/distribution/registry/storage/driver/testsuites"
 	"golang.org/x/oauth2"
diff --git a/registry/storage/driver/s3-aws/s3.go b/registry/storage/driver/s3-aws/s3.go
index 038109b8..3b23f7d5 100644
--- a/registry/storage/driver/s3-aws/s3.go
+++ b/registry/storage/driver/s3-aws/s3.go
@@ -460,7 +460,7 @@ func New(params DriverParameters) (*Driver, error) {
 		setv2Handlers(s3obj)
 	}
 
-	_, err := s3obj.CreateBucket(&s3.CreateBucketInput{
+	_, err = s3obj.CreateBucket(&s3.CreateBucketInput{
 		Bucket: &params.Bucket,
 	})
 	if err != nil {