diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index 57da857cbb..603302eda7 100755
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -688,6 +688,9 @@ sub close_dataconn {
 # what set by "RCPT"
 my $smtp_rcpt;
 
+# The type of server (SMTP or ESMTP)
+my $smtp_type;
+
 sub EHLO_smtp {
     my ($client) = @_;
     my @data;
@@ -698,8 +701,11 @@ sub EHLO_smtp {
         $client = "[127.0.0.1]";
     }
 
+    # Set the server type to ESMTP
+    $smtp_type = "ESMTP";
+
     # Calculate the EHLO response
-    push @data, "ESMTP pingpong test server Hello $client";
+    push @data, "$smtp_type pingpong test server Hello $client";
 
     if((@capabilities) || (@auth_mechs)) {
         my $mechs;
@@ -891,13 +897,17 @@ sub HELO_smtp {
         $client = "[127.0.0.1]";
     }
 
-    sendcontrol "250 SMTP pingpong test server Hello $client\r\n";
+    # Set the server type to SMTP
+    $smtp_type = "SMTP";
+
+    # Send the HELO response
+    sendcontrol "250 $smtp_type pingpong test server Hello $client\r\n";
 
     return 0;
 }
 
 sub QUIT_smtp {
-    sendcontrol "221 byebye\r\n";
+    sendcontrol "221 cURL $smtp_type server signing off\r\n";
 
     return 0;
 }