diff --git a/testing/btest/Baseline/core.print-bpf-filters-ipv4/conn.log b/testing/btest/Baseline/core.print-bpf-filters-ipv4/conn.log
index fc0008ea13..e71eff9d57 100644
--- a/testing/btest/Baseline/core.print-bpf-filters-ipv4/conn.log
+++ b/testing/btest/Baseline/core.print-bpf-filters-ipv4/conn.log
@@ -1 +1,2 @@
-1128727435.450898 1.733303 141.42.64.125 125.190.109.199 http 56730 80 tcp 98 9417 SF X
+# ts	uid	id.orig_h	id.orig_p	id.resp_h	id.resp_p	proto	service	duration	orig_bytes	resp_bytes	conn_state	local_orig	missed_bytes	history	notice_tags
+1128727435.4509	UWkUyAuUGXf	141.42.64.125	56730	125.190.109.199	80	tcp	-	1.73330307006836	98	9417	SF	-	0	ShADdFaf	-
diff --git a/testing/btest/Baseline/core.print-bpf-filters-ipv4/output b/testing/btest/Baseline/core.print-bpf-filters-ipv4/output
index 2b517e8666..164b523b90 100644
--- a/testing/btest/Baseline/core.print-bpf-filters-ipv4/output
+++ b/testing/btest/Baseline/core.print-bpf-filters-ipv4/output
@@ -1,4 +1,8 @@
-not ip6
-not ip6
-(not ip6) and (tcp[13] & 7 != 0)
-port 42
+# ts	node	filter	init	success
+1308602779.63662	-	not ip6	F	T
+# ts	node	filter	init	success
+1308602779.68967	-	(tcp port 22) and (not ip6)	F	T
+# ts	node	filter	init	success
+1308602779.73049	-	port 42	F	T
+# ts	node	filter	init	success
+1308602779.77495	-	port 56730	T	T
diff --git a/testing/btest/Baseline/core.print-bpf-filters-ipv6/conn.log b/testing/btest/Baseline/core.print-bpf-filters-ipv6/conn.log
index fc0008ea13..e71eff9d57 100644
--- a/testing/btest/Baseline/core.print-bpf-filters-ipv6/conn.log
+++ b/testing/btest/Baseline/core.print-bpf-filters-ipv6/conn.log
@@ -1 +1,2 @@
-1128727435.450898 1.733303 141.42.64.125 125.190.109.199 http 56730 80 tcp 98 9417 SF X
+# ts	uid	id.orig_h	id.orig_p	id.resp_h	id.resp_p	proto	service	duration	orig_bytes	resp_bytes	conn_state	local_orig	missed_bytes	history	notice_tags
+1128727435.4509	UWkUyAuUGXf	141.42.64.125	56730	125.190.109.199	80	tcp	-	1.73330307006836	98	9417	SF	-	0	ShADdFaf	-
diff --git a/testing/btest/Baseline/core.print-bpf-filters-ipv6/output b/testing/btest/Baseline/core.print-bpf-filters-ipv6/output
index 56189b3d9f..0065fabfd3 100644
--- a/testing/btest/Baseline/core.print-bpf-filters-ipv6/output
+++ b/testing/btest/Baseline/core.print-bpf-filters-ipv6/output
@@ -1,4 +1,8 @@
-ip or not ip
-ip or not ip
-tcp[13] & 7 != 0
-port 42
+# ts	node	filter	init	success
+1308603220.46822	-	ip or not ip	F	T
+# ts	node	filter	init	success
+1308603220.51607	-	tcp port 22	F	T
+# ts	node	filter	init	success
+1308603220.55432	-	port 42	F	T
+# ts	node	filter	init	success
+1308603220.59452	-	port 56730	T	T
diff --git a/testing/btest/core/print-bpf-filters-ipv4.bro b/testing/btest/core/print-bpf-filters-ipv4.bro
index 5848972166..e709332aee 100644
--- a/testing/btest/core/print-bpf-filters-ipv4.bro
+++ b/testing/btest/core/print-bpf-filters-ipv4.bro
@@ -1,9 +1,12 @@
 # @TEST-REQUIRES: bro -e 'print bro_has_ipv6()' | grep -q F
 #
-# @TEST-EXEC: bro print-filter >output 2>&1
-# @TEST-EXEC: bro tcp print-filter >>output
-# @TEST-EXEC: bro tcp print-filter all_packets=F >>output
-# @TEST-EXEC: bro -f "port 42" print-filter >>output
-# @TEST-EXEC: bro -C -f "port 50343" -r $TRACES/mixed-vlan-mpls.trace tcp
+# @TEST-EXEC: bro -e '' >output
+# @TEST-EXEC: cat packetfilter.log >>output
+# @TEST-EXEC: bro PacketFilter::all_packets=F ssh >>output
+# @TEST-EXEC: cat packetfilter.log >>output
+# @TEST-EXEC: bro -f "port 42" -e '' >>output
+# @TEST-EXEC: cat packetfilter.log >>output
+# @TEST-EXEC: bro -C -f "port 56730" -r $TRACES/mixed-vlan-mpls.trace conn >>output
+# @TEST-EXEC: cat packetfilter.log >>output
 # @TEST-EXEC: btest-diff output
 # @TEST-EXEC: btest-diff conn.log
diff --git a/testing/btest/core/print-bpf-filters-ipv6.bro b/testing/btest/core/print-bpf-filters-ipv6.bro
index 98bbc2db33..f034085411 100644
--- a/testing/btest/core/print-bpf-filters-ipv6.bro
+++ b/testing/btest/core/print-bpf-filters-ipv6.bro
@@ -1,9 +1,12 @@
 # @TEST-REQUIRES: bro -e 'print bro_has_ipv6()' | grep -q T
 #
-# @TEST-EXEC: bro print-filter >output 2>&1
-# @TEST-EXEC: bro tcp print-filter >>output
-# @TEST-EXEC: bro tcp print-filter all_packets=F >>output
-# @TEST-EXEC: bro -f "port 42" print-filter >>output
-# @TEST-EXEC: bro -C -f "port 50343" -r $TRACES/mixed-vlan-mpls.trace tcp
+# @TEST-EXEC: bro -e '' >output
+# @TEST-EXEC: cat packetfilter.log >>output
+# @TEST-EXEC: bro PacketFilter::all_packets=F ssh >>output
+# @TEST-EXEC: cat packetfilter.log >>output
+# @TEST-EXEC: bro -f "port 42" -e '' >>output
+# @TEST-EXEC: cat packetfilter.log >>output
+# @TEST-EXEC: bro -C -f "port 56730" -r $TRACES/mixed-vlan-mpls.trace conn >>output
+# @TEST-EXEC: cat packetfilter.log >>output
 # @TEST-EXEC: btest-diff output
 # @TEST-EXEC: btest-diff conn.log