diff --git a/smtp/smtp_test.go b/smtp/smtp_test.go
index 6df6eeb..d5b02a7 100644
--- a/smtp/smtp_test.go
+++ b/smtp/smtp_test.go
@@ -57,10 +57,31 @@ var authTests = []authTest{
 	},
 	{
 		LoginAuth("user", "pass", "testserver"),
-		[]string{"Username:", "Password:", "User Name\x00", "Password\x00", "Invalid:"},
+		[]string{"Username:", "Password:"},
 		"LOGIN",
-		[]string{"", "user", "pass", "user", "pass", ""},
-		[]bool{false, false, false, false, true},
+		[]string{"", "user", "pass"},
+		[]bool{false, false},
+	},
+	{
+		LoginAuth("user", "pass", "testserver"),
+		[]string{"User Name\x00", "Password\x00"},
+		"LOGIN",
+		[]string{"", "user", "pass"},
+		[]bool{false, false},
+	},
+	{
+		LoginAuth("user", "pass", "testserver"),
+		[]string{"Invalid", "Invalid:"},
+		"LOGIN",
+		[]string{"", "user", "pass"},
+		[]bool{false, false},
+	},
+	{
+		LoginAuth("user", "pass", "testserver"),
+		[]string{"Invalid", "Invalid:", "Too many"},
+		"LOGIN",
+		[]string{"", "user", "pass", ""},
+		[]bool{false, false, true},
 	},
 	{
 		CRAMMD5Auth("user", "pass"),