diff --git a/tests/serverhelp.pm b/tests/serverhelp.pm
index 424697e5e252a8c282e37867871fae03bbd9b742..3fc20cf99e1879a100dec68efa4ef3692c92e64b 100644
--- a/tests/serverhelp.pm
+++ b/tests/serverhelp.pm
@@ -122,6 +122,7 @@ sub server_pidfilename {
 sub server_logfilename {
     my ($logdir, $proto, $ipver, $idnum) = @_;
     my $trailer = '_server.log';
+    $trailer = '_stunnel.log' if(lc($proto) =~ /^(ftp|imap|pop3|smtp)s$/);
     return "${logdir}/". servername_canon($proto, $ipver, $idnum) ."$trailer";
 }