diff --git a/cli/command/container/exec_test.go b/cli/command/container/exec_test.go
index 0a83a5f159..37caa09906 100644
--- a/cli/command/container/exec_test.go
+++ b/cli/command/container/exec_test.go
@@ -215,7 +215,7 @@ func execCreateWithID(_ string, _ types.ExecConfig) (types.IDResponse, error) {
 
 func TestGetExecExitStatus(t *testing.T) {
 	execID := "the exec id"
-	expecatedErr := errors.New("unexpected error")
+	expectedErr := errors.New("unexpected error")
 
 	testcases := []struct {
 		inspectError  error
@@ -227,8 +227,8 @@ func TestGetExecExitStatus(t *testing.T) {
 			exitCode:     0,
 		},
 		{
-			inspectError:  expecatedErr,
-			expectedError: expecatedErr,
+			inspectError:  expectedErr,
+			expectedError: expectedErr,
 		},
 		{
 			exitCode:      15,
diff --git a/cli/command/service/update_test.go b/cli/command/service/update_test.go
index d750a21975..269cd396b4 100644
--- a/cli/command/service/update_test.go
+++ b/cli/command/service/update_test.go
@@ -1278,7 +1278,7 @@ func TestUpdateCredSpec(t *testing.T) {
 			spec:     &swarm.ContainerSpec{},
 			expected: nil,
 		}, {
-			name:    "add a config credenital spec",
+			name:    "add a config credential spec",
 			flagVal: "config://someConfigName",
 			spec: &swarm.ContainerSpec{
 				Configs: []*swarm.ConfigReference{
diff --git a/cli/command/stack/kubernetes/watcher.go b/cli/command/stack/kubernetes/watcher.go
index 4e73287d5c..e538a2d3d1 100644
--- a/cli/command/stack/kubernetes/watcher.go
+++ b/cli/command/stack/kubernetes/watcher.go
@@ -27,13 +27,13 @@ type podListWatch interface {
 	Watch(opts metav1.ListOptions) (watch.Interface, error)
 }
 
-// DeployWatcher watches a stack deployement
+// DeployWatcher watches a stack deployment
 type deployWatcher struct {
 	pods   podListWatch
 	stacks stackListWatch
 }
 
-// Watch watches a stuck deployement and return a chan that will holds the state of the stack
+// Watch watches a stuck deployment and return a chan that will holds the state of the stack
 func (w *deployWatcher) Watch(name string, serviceNames []string, statusUpdates chan serviceStatus) error {
 	errC := make(chan error, 1)
 	defer close(errC)