diff --git a/testing/btest/Baseline/istate.events/receiver.http.log b/testing/btest/Baseline/istate.events/receiver.http.log
index b0ca7b5583..f3519e39aa 100644
--- a/testing/btest/Baseline/istate.events/receiver.http.log
+++ b/testing/btest/Baseline/istate.events/receiver.http.log
@@ -1,18 +1,2 @@
-1301459542.533110 %events-rcv-1 start 141.42.64.125:56730 > 125.190.109.199:80
-1301459542.533110 %events-rcv-1 > USER-AGENT: Wget/1.10
-1301459542.533110 %events-rcv-1 > ACCEPT: */*
-1301459542.533110 %events-rcv-1 > HOST: www.icir.org
-1301459542.533110 %events-rcv-1 > CONNECTION: Keep-Alive
-1301459542.717115 %events-rcv-1 < DATE: Fri, 07 Oct 2005 23:23:55 GMT
-1301459542.717115 %events-rcv-1 < SERVER: Apache/1.3.33 (Unix)
-1301459542.717115 %events-rcv-1 < LAST-MODIFIED: Fri, 07 Oct 2005 16:23:01 GMT
-1301459542.717115 %events-rcv-1 < ETAG: "2c96c-23aa-4346a0e5"
-1301459542.717115 %events-rcv-1 < ACCEPT-RANGES: bytes
-1301459542.717115 %events-rcv-1 < CONTENT-LENGTH: 9130
-1301459542.717115 %events-rcv-1 < KEEP-ALIVE: timeout=15, max=100
-1301459542.717115 %events-rcv-1 < CONNECTION: Keep-Alive
-1301459542.717115 %events-rcv-1 < CONTENT-TYPE: text/html
-1301459542.901119 %events-rcv-1 <= 4096 bytes: "^J^J^JPublications^J
^J^J 125.190.109.199:80
-1301459542.463895 %events-send-1 > USER-AGENT: Wget/1.10
-1301459542.463895 %events-send-1 > ACCEPT: */*
-1301459542.463895 %events-send-1 > HOST: www.icir.org
-1301459542.463895 %events-send-1 > CONNECTION: Keep-Alive
-1301459542.647935 %events-send-1 < DATE: Fri, 07 Oct 2005 23:23:55 GMT
-1301459542.647935 %events-send-1 < SERVER: Apache/1.3.33 (Unix)
-1301459542.647935 %events-send-1 < LAST-MODIFIED: Fri, 07 Oct 2005 16:23:01 GMT
-1301459542.647935 %events-send-1 < ETAG: "2c96c-23aa-4346a0e5"
-1301459542.647935 %events-send-1 < ACCEPT-RANGES: bytes
-1301459542.647935 %events-send-1 < CONTENT-LENGTH: 9130
-1301459542.647935 %events-send-1 < KEEP-ALIVE: timeout=15, max=100
-1301459542.647935 %events-send-1 < CONNECTION: Keep-Alive
-1301459542.647935 %events-send-1 < CONTENT-TYPE: text/html
-1301459542.832424 %events-send-1 <= 4096 bytes: "^J^J^JPublications^J
^J^Jhttp.rec.log
-# @TEST-EXEC: cat sender/http.log | sed 's/^\([^ ]* \)\{2\}//' >http.snd.log
-# @TEST-EXEC: cmp http.rec.log http.snd.log
+# @TEST-EXEC: cmp sender/http.log receiver/http.log
#
-# @TEST-EXEC: bro -x sender/events.bst | sed 's/^Event \[[-0-9.]*\] //g' | sed 's/%events-[^ ]* *//g' | grep '^http_' | grep -v http_stats >events.snd.log
-# @TEST-EXEC: bro -x receiver/events.bst | sed 's/^Event \[[-0-9.]*\] //g' | sed 's/%events-[^ ]* *//g' | grep '^http_' | grep -v http_stats >events.rec.log
+# @TEST-EXEC: bro -x sender/events.bst http/base | sed 's/^Event \[[-0-9.]*\] //g' | sed 's/%events-[^ ]* *//g' | grep '^http_' | grep -v http_stats >events.snd.log
+# @TEST-EXEC: bro -x receiver/events.bst http/base | sed 's/^Event \[[-0-9.]*\] //g' | sed 's/%events-[^ ]* *//g' | grep '^http_' | grep -v http_stats >events.rec.log
# @TEST-EXEC: cmp events.rec.log events.snd.log
@TEST-START-FILE sender.bro
-@load tcp
-@load http-request
-@load http-reply
-@load http-header
-@load http-body
-@load http-abstract
-@load listen-clear
+@load http/base
+@load communication/listen-clear
-@load capture-events
+event bro_init()
+ {
+ capture_events("events.bst");
+ }
redef peer_description = "events-send";
@@ -38,19 +34,17 @@ redef tcp_close_delay = 0secs;
@TEST-START-FILE receiver.bro
-@load tcp
-@load http-request
-@load http-reply
-@load http-header
-@load http-body
-@load http-abstract
+@load http/base
+@load communication
-@load capture-events
-@load remote
+event bro_init()
+ {
+ capture_events("events.bst");
+ }
redef peer_description = "events-rcv";
-redef Remote::destinations += {
+redef Communication::nodes += {
["foo"] = [$host = 127.0.0.1, $events = /http_.*/, $connect=T]
};