diff --git a/lib/smtp.c b/lib/smtp.c
index fd8d712262..dd08575beb 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -224,7 +224,7 @@ static int smtp_endofresp(struct pingpong *pp, int *resp)
     *resp = curlx_sltosi(strtol(line, NULL, 10));
 
   /* Are we processing EHLO command data? */
-  if(smtpc->state == SMTP_EHLO && (!result || (result && *resp == 250))) {
+  if(smtpc->state == SMTP_EHLO && (!result || (result && *resp/100 == 2))) {
     line += 4;
     len -= 4;
 
diff --git a/tests/data/test805 b/tests/data/test805
index 4595221c9e..d124e40e71 100644
--- a/tests/data/test805
+++ b/tests/data/test805
@@ -12,7 +12,7 @@ RFC4954
 # Server-side
 <reply>
 <servercmd>
-REPLY EHLO 220 AUTH PLAIN
+REPLY EHLO 250 AUTH PLAIN
 REPLY AUTH 235 Authenticated
 </servercmd>
 </reply>
diff --git a/tests/data/test806 b/tests/data/test806
index b71ac5ccee..9d1c988149 100644
--- a/tests/data/test806
+++ b/tests/data/test806
@@ -11,7 +11,7 @@ RFC4954
 # Server-side
 <reply>
 <servercmd>
-REPLY EHLO 220 AUTH LOGIN
+REPLY EHLO 250 AUTH LOGIN
 REPLY AUTH 334 UGFzc3dvcmQ6
 REPLY MTIzNA== 235 Authenticated
 </servercmd>
diff --git a/tests/data/test807 b/tests/data/test807
index d171ffabc7..4165a1553e 100644
--- a/tests/data/test807
+++ b/tests/data/test807
@@ -12,7 +12,7 @@ RFC4954
 # Server-side
 <reply>
 <servercmd>
-REPLY EHLO 220 AUTH CRAM-MD5
+REPLY EHLO 250 AUTH CRAM-MD5
 REPLY AUTH 334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+
 REPLY dGltIGI5MTNhNjAyYzdlZGE3YTQ5NWI0ZTZlNzMzNGQzODkw 235 Authenticated
 </servercmd>