diff --git a/registry/auth/auth.go b/registry/auth/auth.go
index b9c3b01dc..b23e527ac 100644
--- a/registry/auth/auth.go
+++ b/registry/auth/auth.go
@@ -56,7 +56,7 @@ func init() {
 }
 
 // UserInfo carries information about
-// an autenticated/authorized client.
+// an authenticated/authorized client.
 type UserInfo struct {
 	Name string
 }
diff --git a/registry/auth/token/accesscontroller.go b/registry/auth/token/accesscontroller.go
index 8f610c46d..b88268e31 100644
--- a/registry/auth/token/accesscontroller.go
+++ b/registry/auth/token/accesscontroller.go
@@ -143,7 +143,7 @@ type accessController struct {
 }
 
 // tokenAccessOptions is a convenience type for handling
-// options to the contstructor of an accessController.
+// options to the constructor of an accessController.
 type tokenAccessOptions struct {
 	realm          string
 	autoRedirect   bool
diff --git a/registry/auth/token/token.go b/registry/auth/token/token.go
index 83fe58c7f..e849f00b6 100644
--- a/registry/auth/token/token.go
+++ b/registry/auth/token/token.go
@@ -226,7 +226,7 @@ func getCertPubKey(chains [][]*x509.Certificate) crypto.PublicKey {
 
 	// NOTE: we dont have to verify that the public key in the leaf cert
 	// *is* the signing key: if it's not the signing then token claims
-	// verifcation with this key fails
+	// verification with this key fails
 	return cert.PublicKey.(crypto.PublicKey)
 }
 
diff --git a/registry/storage/blob_test.go b/registry/storage/blob_test.go
index 768cd65c3..25ac325c6 100644
--- a/registry/storage/blob_test.go
+++ b/registry/storage/blob_test.go
@@ -40,7 +40,7 @@ func TestWriteSeek(t *testing.T) {
 	}
 	contents := []byte{1, 2, 3}
 	if _, err := blobUpload.Write(contents); err != nil {
-		t.Fatalf("unexpected error writing contets: %v", err)
+		t.Fatalf("unexpected error writing contents: %v", err)
 	}
 	blobUpload.Close()
 	offset := blobUpload.Size()
diff --git a/registry/storage/cache/redis/redis_test.go b/registry/storage/cache/redis/redis_test.go
index 328a2ec93..2b057ca82 100644
--- a/registry/storage/cache/redis/redis_test.go
+++ b/registry/storage/cache/redis/redis_test.go
@@ -20,7 +20,7 @@ func init() {
 // implementation.
 func TestRedisBlobDescriptorCacheProvider(t *testing.T) {
 	if redisAddr == "" {
-		// fallback to an environement variable
+		// fallback to an environment variable
 		redisAddr = os.Getenv("TEST_REGISTRY_STORAGE_CACHE_REDIS_ADDR")
 	}
 
diff --git a/registry/storage/driver/middleware/cloudfront/middleware_test.go b/registry/storage/driver/middleware/cloudfront/middleware_test.go
index 9d1e11a22..2fa8243d8 100644
--- a/registry/storage/driver/middleware/cloudfront/middleware_test.go
+++ b/registry/storage/driver/middleware/cloudfront/middleware_test.go
@@ -50,6 +50,6 @@ pZeMRablbPQdp8/1NyIwimq1VlG0ohQ4P6qhW7E09ZMC
 		t.Fatal(err)
 	}
 	if storageDriver == nil {
-		t.Fatal("Driver couldnt be initialized.")
+		t.Fatal("Driver could not be initialized")
 	}
 }