diff --git a/testing/btest/Baseline/bifs.to_count/err b/testing/btest/Baseline/bifs.to_count/err
new file mode 100644
index 0000000000..ab7985d22b
--- /dev/null
+++ b/testing/btest/Baseline/bifs.to_count/err
@@ -0,0 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+error in <...>/to_count.zeek, line 8: bad conversion to count (int_to_count(a) and -2)
+error in <...>/to_count.zeek, line 20: bad conversion to count (to_count() and )
+error in <...>/to_count.zeek, line 22: bad conversion to count (to_count(not a count) and not a count)
diff --git a/testing/btest/Baseline/bifs.to_int/err b/testing/btest/Baseline/bifs.to_int/err
new file mode 100644
index 0000000000..49d861c74c
--- /dev/null
+++ b/testing/btest/Baseline/bifs.to_int/err
@@ -0,0 +1 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
diff --git a/testing/btest/bifs/to_count.zeek b/testing/btest/bifs/to_count.zeek
index 7489ca8b79..2c20e0e7cb 100644
--- a/testing/btest/bifs/to_count.zeek
+++ b/testing/btest/bifs/to_count.zeek
@@ -1,6 +1,6 @@
-#
-# @TEST-EXEC: zeek -b %INPUT >out
+# @TEST-EXEC: zeek -b %INPUT 1>out 2>err
 # @TEST-EXEC: btest-diff out
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=${SCRIPTS}/diff-remove-abspath btest-diff err
 
 event zeek_init()
 	{
@@ -24,12 +24,12 @@ event zeek_init()
 	local e: port = 123/tcp;
 	print port_to_count(e);
 
-	local origString =        "9223372036854775808";
+	local origString = "9223372036854775808";
 	local directCount: count = 9223372036854775808;
 	local fromStringCount: count = to_count(origString);
 
 	if ( directCount == fromStringCount )
-	   print fmt("%s and %s are the same", directCount, fromStringCount);
+		print fmt("%s and %s are the same", directCount, fromStringCount);
 	else
-	   print fmt("%s and %s are not the same", directCount, fromStringCount);
+		print fmt("%s and %s are not the same", directCount, fromStringCount);
 	}
diff --git a/testing/btest/bifs/to_int.zeek b/testing/btest/bifs/to_int.zeek
index 17e433f975..3ad5eac7ae 100644
--- a/testing/btest/bifs/to_int.zeek
+++ b/testing/btest/bifs/to_int.zeek
@@ -1,6 +1,6 @@
-#
-# @TEST-EXEC: zeek -b %INPUT >out
+# @TEST-EXEC: zeek -b %INPUT 1>out 2>err
 # @TEST-EXEC: btest-diff out
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=${SCRIPTS}/diff-remove-abspath btest-diff err
 
 event zeek_init()
 	{