diff --git a/testing/btest/Baseline/core.print-bpf-filters/conn.log b/testing/btest/Baseline/core.print-bpf-filters-ipv4/conn.log
similarity index 100%
rename from testing/btest/Baseline/core.print-bpf-filters/conn.log
rename to testing/btest/Baseline/core.print-bpf-filters-ipv4/conn.log
diff --git a/testing/btest/Baseline/core.print-bpf-filters-ipv4/output b/testing/btest/Baseline/core.print-bpf-filters-ipv4/output
new file mode 100644
index 0000000000..2b517e8666
--- /dev/null
+++ b/testing/btest/Baseline/core.print-bpf-filters-ipv4/output
@@ -0,0 +1,4 @@
+not ip6
+not ip6
+(not ip6) and (tcp[13] & 7 != 0)
+port 42
diff --git a/testing/btest/Baseline/core.print-bpf-filters-ipv6/conn.log b/testing/btest/Baseline/core.print-bpf-filters-ipv6/conn.log
new file mode 100644
index 0000000000..fc0008ea13
--- /dev/null
+++ b/testing/btest/Baseline/core.print-bpf-filters-ipv6/conn.log
@@ -0,0 +1 @@
+1128727435.450898 1.733303 141.42.64.125 125.190.109.199 http 56730 80 tcp 98 9417 SF X
diff --git a/testing/btest/Baseline/core.print-bpf-filters/output b/testing/btest/Baseline/core.print-bpf-filters-ipv6/output
similarity index 100%
rename from testing/btest/Baseline/core.print-bpf-filters/output
rename to testing/btest/Baseline/core.print-bpf-filters-ipv6/output
diff --git a/testing/btest/Baseline/logging.rotate-custom/out b/testing/btest/Baseline/logging.rotate-custom/out
index c87445cff5..58e41291f3 100644
--- a/testing/btest/Baseline/logging.rotate-custom/out
+++ b/testing/btest/Baseline/logging.rotate-custom/out
@@ -28,7 +28,6 @@
 2nd test2-11-03-07_12.00.05.log test2.log 11-03-07_12.00.05 11-03-07_12.59.55 0
 1st test-11-03-07_12.00.05.log test.log 11-03-07_12.00.05 11-03-07_12.59.55 1
 2nd test2-11-03-07_12.59.55.log test2.log 11-03-07_12.59.55 11-03-07_12.59.55 1
-# t	id.orig_h	id.orig_p	id.resp_h	id.resp_p
 1299466805.0	10.0.0.1	20	10.0.0.2	1024
 1299470395.0	10.0.0.2	20	10.0.0.3	0
 1299470405.0	10.0.0.1	20	10.0.0.2	1025
@@ -59,7 +58,6 @@
 > test-11-03-07_10.00.05.log
 > test-11-03-07_11.00.05.log
 > test-11-03-07_12.00.05.log
-> test.log
 > test2-11-03-07_03.00.05.log
 > test2-11-03-07_03.59.55.log
 > test2-11-03-07_04.00.05.log
@@ -81,3 +79,5 @@
 > test2-11-03-07_12.00.05.log
 > test2-11-03-07_12.59.55.log
 > test2.log
+> test.log
+# t	id.orig_h	id.orig_p	id.resp_h	id.resp_p
diff --git a/testing/btest/core/print-bpf-filters.bro b/testing/btest/core/print-bpf-filters-ipv4.bro
similarity index 84%
rename from testing/btest/core/print-bpf-filters.bro
rename to testing/btest/core/print-bpf-filters-ipv4.bro
index 274eed2961..5848972166 100644
--- a/testing/btest/core/print-bpf-filters.bro
+++ b/testing/btest/core/print-bpf-filters-ipv4.bro
@@ -1,3 +1,5 @@
+# @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
diff --git a/testing/btest/core/print-bpf-filters-ipv6.bro b/testing/btest/core/print-bpf-filters-ipv6.bro
new file mode 100644
index 0000000000..98bbc2db33
--- /dev/null
+++ b/testing/btest/core/print-bpf-filters-ipv6.bro
@@ -0,0 +1,9 @@
+# @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: btest-diff output
+# @TEST-EXEC: btest-diff conn.log