diff --git a/scripts/base/protocols/pop3/dpd.sig b/scripts/base/protocols/pop3/dpd.sig
index 8d7e3567da..8793f249a1 100644
--- a/scripts/base/protocols/pop3/dpd.sig
+++ b/scripts/base/protocols/pop3/dpd.sig
@@ -8,6 +8,6 @@ signature dpd_pop3_server {
 
 signature dpd_pop3_client {
   ip-proto == tcp
-  payload /(|.*[\r\n])[[:space:]]*([uU][sS][eE][rR][[:space:]]|[aA][pP][oO][pP][[:space:]]|[cC][aA][pP][aA]|[aA][uU][tT][hH])/
+  payload /(|.*[\r\n])[[:space:]]*([uU][sS][eE][rR][[:space:]]|[aA][pP][oO][pP][[:space:]]|[cC][aA][pP][aA]|[aA][uU][tT][hH]|[sS][tT][lL][sS])/
   tcp-state originator
 }
diff --git a/testing/btest/scripts/base/protocols/pop3/starttls.zeek b/testing/btest/scripts/base/protocols/pop3/starttls.zeek
index ca3cf96d40..94d34bedaa 100644
--- a/testing/btest/scripts/base/protocols/pop3/starttls.zeek
+++ b/testing/btest/scripts/base/protocols/pop3/starttls.zeek
@@ -5,15 +5,4 @@
 
 @load base/protocols/conn
 @load base/protocols/ssl
-
-module POP3;
-
-const ports = {
-	110/tcp
-};
-redef likely_server_ports += { ports };
-
-event zeek_init() &priority=5
-	{
-	Analyzer::register_for_ports(Analyzer::ANALYZER_POP3, ports);
-	}
+@load base/protocols/pop3