diff --git a/client/client_test.go b/client/client_test.go
index d0dae90434..b71c1bbeb4 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -17,8 +17,8 @@ import (
 	"github.com/docker/notary/server/handlers"
 	"github.com/docker/notary/server/storage"
 	"github.com/docker/notary/trustmanager"
-	"github.com/docker/notary/utils"
 	"github.com/docker/notary/tuf/data"
+	"github.com/docker/notary/utils"
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
diff --git a/cmd/notary-signer/main.go b/cmd/notary-signer/main.go
index d0289baa14..892bdeec96 100644
--- a/cmd/notary-signer/main.go
+++ b/cmd/notary-signer/main.go
@@ -20,9 +20,9 @@ import (
 	"github.com/docker/notary/cryptoservice"
 	"github.com/docker/notary/signer"
 	"github.com/docker/notary/signer/api"
+	"github.com/docker/notary/tuf/data"
 	"github.com/docker/notary/utils"
 	"github.com/docker/notary/version"
-	"github.com/docker/notary/tuf/data"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/miekg/pkcs11"
 	"github.com/spf13/viper"
diff --git a/signer/keydbstore.go b/signer/keydbstore.go
index 6617940f3d..c2e3dcabe9 100644
--- a/signer/keydbstore.go
+++ b/signer/keydbstore.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/docker/notary/pkg/passphrase"
 	"github.com/docker/notary/trustmanager"
-	jose "github.com/dvsekhvalnov/jose2go"
 	"github.com/docker/notary/tuf/data"
+	jose "github.com/dvsekhvalnov/jose2go"
 	"github.com/jinzhu/gorm"
 )
 
diff --git a/signer/signer_trust.go b/signer/signer_trust.go
index 58d6571115..a1cb082c48 100644
--- a/signer/signer_trust.go
+++ b/signer/signer_trust.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	pb "github.com/docker/notary/proto"
-	"github.com/docker/notary/utils"
 	"github.com/docker/notary/tuf/data"
+	"github.com/docker/notary/utils"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/tuf/signed/sign_test.go b/tuf/signed/sign_test.go
index 73acfd8137..61964f7be4 100644
--- a/tuf/signed/sign_test.go
+++ b/tuf/signed/sign_test.go
@@ -154,7 +154,7 @@ func TestMultiSign(t *testing.T) {
 		t.Fatalf("Incorrect number of signatures: %d", len(testData.Signatures))
 	}
 
-	keyIDs := map[string]struct{}{testKeyID1: struct{}{}, testKeyID2: struct{}{}}
+	keyIDs := map[string]struct{}{testKeyID1: {}, testKeyID2: {}}
 	for _, sig := range testData.Signatures {
 		if _, ok := keyIDs[sig.KeyID]; !ok {
 			t.Fatalf("Got a signature we didn't expect: %s", sig.KeyID)
diff --git a/tuf/signed/verify_test.go b/tuf/signed/verify_test.go
index 4c0ee9d519..233bbb61e1 100644
--- a/tuf/signed/verify_test.go
+++ b/tuf/signed/verify_test.go
@@ -162,7 +162,7 @@ func Test(t *testing.T) {
 		}
 		if run.roles == nil {
 			run.roles = map[string]*data.Role{
-				"root": &data.Role{
+				"root": {
 					RootRole: data.RootRole{
 						KeyIDs:    []string{run.keys[0].ID()},
 						Threshold: 1,