@@ -37,7 +37,7 @@ func (s *DockerSuite) TestVolumeCliInspect(c *check.C) {

 	c.Assert(

 		exec.Command(dockerBinary, "volume", "inspect", "doesntexist").Run(),

 		check.Not(check.IsNil),

-		check.Commentf("volume inspect should error on non-existant volume"),

+		check.Commentf("volume inspect should error on non-existent volume"),

 	)

 	out, _ := dockerCmd(c, "volume", "create")

@@ -144,7 +144,7 @@ func (s *DockerSuite) TestVolumeCliRm(c *check.C) {

 	c.Assert(

 		exec.Command("volume", "rm", "doesntexist").Run(),

 		check.Not(check.IsNil),

-		check.Commentf("volume rm should fail with non-existant volume"),

+		check.Commentf("volume rm should fail with non-existent volume"),

 	)

 }

@@ -14,10 +14,10 @@ func TestPollerAddRemove(t *testing.T) {

 	w := NewPollingWatcher()

 	if err := w.Add("no-such-file"); err == nil {

-		t.Fatal("should have gotten error when adding a non-existant file")

+		t.Fatal("should have gotten error when adding a non-existent file")

 	}

 	if err := w.Remove("no-such-file"); err == nil {

-		t.Fatal("should have gotten error when removing non-existant watch")

+		t.Fatal("should have gotten error when removing non-existent watch")

 	}

 	f, err := ioutil.TempFile("", "asdf")

@@ -66,7 +66,7 @@ func (m *MountPoint) Setup() (string, error) {

 				return "", err

 			}

 			if runtime.GOOS != "windows" { // Windows does not have deprecation issues here

-				logrus.Warnf("Auto-creating non-existant volume host path %s, this is deprecated and will be removed soon", m.Source)

+				logrus.Warnf("Auto-creating non-existent volume host path %s, this is deprecated and will be removed soon", m.Source)

 				if err := system.MkdirAll(m.Source, 0755); err != nil {

 					return "", err

 				}