diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index f6cb25511..4c0144ff9 100755
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -581,12 +581,12 @@ sub protocolsetup {
             'EXAMINE' => \&EXAMINE_imap,
             'FETCH'  => \&FETCH_imap,
             'LIST'   => \&LIST_imap,
+            'LOGOUT'   => \&LOGOUT_imap,
             'SELECT' => \&SELECT_imap,
             'STORE'  => \&STORE_imap
         );
         %displaytext = (
             'LOGIN'  => ' OK We are happy you popped in!',
-            'LOGOUT' => ' OK thanks for the fish',
             'welcome' => join("",
             '        _   _ ____  _     '."\r\n",
             '    ___| | | |  _ \| |    '."\r\n",
@@ -1004,6 +1004,13 @@ sub EXAMINE_imap {
     return 0;
 }
 
+sub LOGOUT_imap {
+    sendcontrol "* BYE cURL IMAP server signing off\r\n";
+    sendcontrol "$cmdid OK LOGOUT completed\r\n";
+
+    return 0;
+}
+
 ################
 ################ POP3 commands
 ################