diff --git a/testing/btest/Baseline/scripts.base.frameworks.communication.communication_log_baseline/send.log b/testing/btest/Baseline/scripts.base.frameworks.communication.communication_log_baseline/send.log
index e5dfb59592..d3c14c8603 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.communication.communication_log_baseline/send.log
+++ b/testing/btest/Baseline/scripts.base.frameworks.communication.communication_log_baseline/send.log
@@ -5,15 +5,17 @@
 #path	communication
 #fields	ts	peer	src_name	connected_peer_desc	connected_peer_addr	connected_peer_port	level	message
 #types	time	string	string	string	addr	port	string	string
-1324314302.411344	bro	parent	-	-	-	info	[#1/127.0.0.1:47757] added peer
-1324314302.414978	bro	child	-	-	-	info	[#1/127.0.0.1:47757] connected
-1324314302.415099	bro	parent	-	-	-	info	[#1/127.0.0.1:47757] peer connected
-1324314302.415099	bro	parent	-	-	-	info	[#1/127.0.0.1:47757] phase: version
-1324314302.417446	bro	script	-	-	-	info	connection established
-1324314302.417446	bro	script	-	-	-	info	requesting events matching /^?(NOTHING)$?/
-1324314302.417446	bro	script	-	-	-	info	accepting state
-1324314302.418003	bro	parent	-	-	-	info	[#1/127.0.0.1:47757] phase: handshake
-1324314302.418003	bro	parent	-	-	-	info	warning: no events to request
-1324314302.418003	bro	parent	-	-	-	info	terminating...
-1324314302.418003	bro	parent	-	-	-	info	[#1/127.0.0.1:47757] peer_description is bro
-1324314302.418003	bro	parent	-	-	-	info	[#1/127.0.0.1:47757] closing connection
+1326492291.485390	bro	parent	-	-	-	info	[#1/127.0.0.1:47757] added peer
+1326492291.491731	bro	child	-	-	-	info	[#1/127.0.0.1:47757] connected
+1326492291.492024	bro	parent	-	-	-	info	[#1/127.0.0.1:47757] peer connected
+1326492291.492024	bro	parent	-	-	-	info	[#1/127.0.0.1:47757] phase: version
+1326492291.492740	bro	script	-	-	-	info	connection established
+1326492291.492740	bro	script	-	-	-	info	requesting events matching /^?(NOTHING)$?/
+1326492291.492740	bro	script	-	-	-	info	accepting state
+1326492291.493800	bro	parent	-	-	-	info	[#1/127.0.0.1:47757] phase: handshake
+1326492291.493800	bro	parent	-	-	-	info	warning: no events to request
+1326492291.494161	bro	parent	-	-	-	info	[#1/127.0.0.1:47757] peer_description is bro
+1326492291.494404	bro	parent	-	-	-	info	[#1/127.0.0.1:47757] peer supports keep-in-cache; using that
+1326492291.494404	bro	parent	-	-	-	info	[#1/127.0.0.1:47757] phase: running
+1326492291.494404	bro	parent	-	-	-	info	terminating...
+1326492291.494404	bro	parent	-	-	-	info	[#1/127.0.0.1:47757] closing connection
diff --git a/testing/btest/scripts/base/frameworks/communication/communication_log_baseline.bro b/testing/btest/scripts/base/frameworks/communication/communication_log_baseline.bro
index 3a4c1253eb..dc3b43ad67 100644
--- a/testing/btest/scripts/base/frameworks/communication/communication_log_baseline.bro
+++ b/testing/btest/scripts/base/frameworks/communication/communication_log_baseline.bro
@@ -15,7 +15,7 @@ redef Communication::nodes += {
     ["foo"] = [$host = 127.0.0.1, $events = /NOTHING/, $connect=T]
 };
 
-event remote_connection_established(p: event_peer)
+event remote_connection_handshake_done(p: event_peer)
 	{
 	terminate_communication();
 	terminate();
@@ -29,8 +29,9 @@ event remote_connection_established(p: event_peer)
 
 @load frameworks/communication/listen
 
-event remote_connection_closed(p: event_peer)
+event remote_connection_handshake_done(p: event_peer)
 	{
+	terminate_communication();
 	terminate();
 	}