diff --git a/context/doc.go b/context/doc.go
index 3b4ab8882..9b623074e 100644
--- a/context/doc.go
+++ b/context/doc.go
@@ -64,7 +64,7 @@
 // Note that this only affects the new context, the previous context, with the
 // version field, can be used independently. Put another way, the new logger,
 // added to the request context, is unique to that context and can have
-// request scoped varaibles.
+// request scoped variables.
 //
 // HTTP Requests
 //
diff --git a/health/health_test.go b/health/health_test.go
index 766fe159f..8d1a028b7 100644
--- a/health/health_test.go
+++ b/health/health_test.go
@@ -25,8 +25,8 @@ func TestReturns200IfThereAreNoChecks(t *testing.T) {
 	}
 }
 
-// TestReturns500IfThereAreErrorChecks ensures that the result code of the
-// health endpoint is 500 if there are health checks with errors
+// TestReturns503IfThereAreErrorChecks ensures that the result code of the
+// health endpoint is 503 if there are health checks with errors.
 func TestReturns503IfThereAreErrorChecks(t *testing.T) {
 	recorder := httptest.NewRecorder()
 
diff --git a/manifest/manifestlist/manifestlist.go b/manifest/manifestlist/manifestlist.go
index 7a8cabbdb..3aa0662d9 100644
--- a/manifest/manifestlist/manifestlist.go
+++ b/manifest/manifestlist/manifestlist.go
@@ -81,7 +81,7 @@ type ManifestList struct {
 	Manifests []ManifestDescriptor `json:"manifests"`
 }
 
-// References returnes the distribution descriptors for the referenced image
+// References returns the distribution descriptors for the referenced image
 // manifests.
 func (m ManifestList) References() []distribution.Descriptor {
 	dependencies := make([]distribution.Descriptor, len(m.Manifests))