@@ -28,17 +28,3 @@ func (s *DockerRegistryAuthHtpasswdSuite) TestLoginToPrivateRegistry(c *check.C)

 	// now it's fine

 	dockerCmd(c, "login", "-u", s.reg.Username(), "-p", s.reg.Password(), privateRegistryURL)

 }

-

-func (s *DockerRegistryAuthHtpasswdSuite) TestLoginToPrivateRegistryDeprecatedEmailFlag(c *check.C) {

-	// Test to make sure login still works with the deprecated -e and --email flags

-	// wrong credentials

-	out, _, err := dockerCmdWithError("login", "-u", s.reg.Username(), "-p", "WRONGPASSWORD", "-e", s.reg.Email(), privateRegistryURL)

-	c.Assert(err, checker.NotNil, check.Commentf(out))

-	c.Assert(out, checker.Contains, "401 Unauthorized")

-

-	// now it's fine

-	// -e flag

-	dockerCmd(c, "login", "-u", s.reg.Username(), "-p", s.reg.Password(), "-e", s.reg.Email(), privateRegistryURL)

-	// --email flag

-	dockerCmd(c, "login", "-u", s.reg.Username(), "-p", s.reg.Password(), "--email", s.reg.Email(), privateRegistryURL)

-}

@@ -107,7 +107,7 @@ func (s *DockerRegistrySuite) TestUserAgentPassThrough(c *check.C) {

 	s.d.Cmd("build", "--file", dockerfileName, ".")

 	regexpCheckUA(c, buildUA)

-	s.d.Cmd("login", "-u", "richard", "-p", "testtest", "-e", "testuser@testdomain.com", loginReg.URL())

+	s.d.Cmd("login", "-u", "richard", "-p", "testtest", loginReg.URL())

 	regexpCheckUA(c, loginUA)

 	s.d.Cmd("pull", pullRepoName)

@@ -60,7 +60,7 @@ func (s *DockerRegistrySuite) TestV2Only(c *check.C) {

 	s.d.Cmd("build", "--file", dockerfileName, ".")

 	s.d.Cmd("run", repoName)

-	s.d.Cmd("login", "-u", "richard", "-p", "testtest", "-e", "testuser@testdomain.com", reg.URL())

+	s.d.Cmd("login", "-u", "richard", "-p", "testtest", reg.URL())

 	s.d.Cmd("tag", "busybox", repoName)

 	s.d.Cmd("push", repoName)

 	s.d.Cmd("pull", repoName)