diff --git a/authenticate_test.go b/authenticate_test.go
index 1d4d1f5..32329ff 100644
--- a/authenticate_test.go
+++ b/authenticate_test.go
@@ -129,9 +129,9 @@
 		UseCustomClient(&http.Client{Transport: newTransport().WithResponse(SUCCESSFUL_RESPONSE)})
 
 	credentials := []AuthOptions{
-		AuthOptions{},
-		AuthOptions{Username: "u"},
-		AuthOptions{Password: "p"},
+		{},
+		{Username: "u"},
+		{Password: "p"},
 	}
 	for i, auth := range credentials {
 		_, err := c.Authenticate("provider", auth)
diff --git a/global_context.go b/global_context.go
index 5a3b162..cf5ed8f 100644
--- a/global_context.go
+++ b/global_context.go
@@ -12,10 +12,10 @@
 
 // providers is the set of supported providers.
 var providers = map[string]Provider{
-	"rackspace-us": Provider{
+	"rackspace-us": {
 		AuthEndpoint: "https://identity.api.rackspacecloud.com/v2.0/tokens",
 	},
-	"rackspace-uk": Provider{
+	"rackspace-uk": {
 		AuthEndpoint: "https://lon.identity.api.rackspacecloud.com/v2.0/tokens",
 	},
 }
diff --git a/service_catalog_test.go b/service_catalog_test.go
index 4420366..2ff6199 100644
--- a/service_catalog_test.go
+++ b/service_catalog_test.go
@@ -13,7 +13,7 @@
 
 	endpoint = FindFirstEndpointByCriteria(
 		[]CatalogEntry{
-			CatalogEntry{Name: "test"},
+			{Name: "test"},
 		},
 		ApiCriteria{Name: "test"},
 	)
@@ -88,10 +88,10 @@
 
 func catalog(name, url, region, version string) []CatalogEntry {
 	return []CatalogEntry{
-		CatalogEntry{
+		{
 			Name: name,
 			Endpoints: []EntryEndpoint{
-				EntryEndpoint{
+				{
 					PublicURL: url,
 					Region:    region,
 					VersionId: version,