diff --git a/container_create_test.go b/container_create_test.go
index 73474cf56f..3ab608c21e 100644
--- a/container_create_test.go
+++ b/container_create_test.go
@@ -22,7 +22,7 @@ func TestContainerCreateError(t *testing.T) {
 		t.Fatalf("expected a Server Error while testing StatusInternalServerError, got %v", err)
 	}
 
-	// 404 doesn't automagitally means an unknown image
+	// 404 doesn't automatically means an unknown image
 	client = &Client{
 		client: newMockClient(errorMock(http.StatusNotFound, "Server error")),
 	}
diff --git a/image_tag_test.go b/image_tag_test.go
index d37bd0e85e..52c5e873a5 100644
--- a/image_tag_test.go
+++ b/image_tag_test.go
@@ -22,7 +22,7 @@ func TestImageTagError(t *testing.T) {
 	}
 }
 
-// Note: this is not testing all the InvalidReference as it's the reponsability
+// Note: this is not testing all the InvalidReference as it's the responsibility
 // of distribution/reference package.
 func TestImageTagInvalidReference(t *testing.T) {
 	client := &Client{
diff --git a/swarm_unlock.go b/swarm_unlock.go
index 502c6b8407..9ee441fed2 100644
--- a/swarm_unlock.go
+++ b/swarm_unlock.go
@@ -5,7 +5,7 @@ import (
 	"golang.org/x/net/context"
 )
 
-// SwarmUnlock unlockes locked swarm.
+// SwarmUnlock unlocks locked swarm.
 func (cli *Client) SwarmUnlock(ctx context.Context, req swarm.UnlockRequest) error {
 	serverResp, err := cli.post(ctx, "/swarm/unlock", nil, req, nil)
 	ensureReaderClosed(serverResp)