diff --git a/client/container_wait.go b/client/container_wait.go
index af4559c4b9..13b5eea6a9 100644
--- a/client/container_wait.go
+++ b/client/container_wait.go
@@ -10,7 +10,7 @@ import (
 	"github.com/docker/docker/api/types/versions"
 )
 
-// ContainerWait waits until the specified continer is in a certain state
+// ContainerWait waits until the specified container is in a certain state
 // indicated by the given condition, either "not-running" (default),
 // "next-exit", or "removed".
 //
diff --git a/container/state.go b/container/state.go
index e99fe008bb..b87577b1c0 100644
--- a/container/state.go
+++ b/container/state.go
@@ -180,7 +180,7 @@ const (
 	WaitConditionRemoved
 )
 
-// Wait waits until the continer is in a certain state indicated by the given
+// Wait waits until the container is in a certain state indicated by the given
 // condition. A context must be used for cancelling the request, controlling
 // timeouts, and avoiding goroutine leaks. Wait must be called without holding
 // the state lock. Returns a channel from which the caller will receive the
diff --git a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_cli_swarm_test.go
index 8a8c8d0fcd..086a6632d2 100644
--- a/integration-cli/docker_cli_swarm_test.go
+++ b/integration-cli/docker_cli_swarm_test.go
@@ -448,7 +448,7 @@ func (s *DockerSwarmSuite) TestOverlayAttachableReleaseResourcesOnFailure(c *che
 	out, err = d.Cmd("run", "-d", "--network", "ovnet", "--name", "c1", "--ip", "10.10.9.33", "busybox", "top")
 	c.Assert(err, checker.IsNil, check.Commentf(out))
 
-	// Attempt to attach another contianer with same IP, must fail
+	// Attempt to attach another container with same IP, must fail
 	_, err = d.Cmd("run", "-d", "--network", "ovnet", "--name", "c2", "--ip", "10.10.9.33", "busybox", "top")
 	c.Assert(err, checker.NotNil)