diff --git a/testing/btest/Baseline.cpp/bifs.to_addr/error b/testing/btest/Baseline.cpp/bifs.to_addr/error
index 1a715f8849..d6d57e537c 100644
--- a/testing/btest/Baseline.cpp/bifs.to_addr/error
+++ b/testing/btest/Baseline.cpp/bifs.to_addr/error
@@ -1,2 +1,2 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-error in <...>/to_addr.zeek (C++), line 12: failed converting string to IP address (Users_vern_warehouse_zeek_zeek_master_02Mar23_testing_btest__tmp_bifs_to_addr_to_addr_zeek__global_stmts__zf() and not an IP)
+error in <...>/to_addr.zeek (C++), line 12: failed converting string to IP address (<___>testing_btest__tmp_bifs_to_addr_to_addr_zeek__global_stmts__zf() and not an IP)
diff --git a/testing/btest/Baseline.cpp/bifs.to_double_from_string/error b/testing/btest/Baseline.cpp/bifs.to_double_from_string/error
index 44a73e186f..009ff7118b 100644
--- a/testing/btest/Baseline.cpp/bifs.to_double_from_string/error
+++ b/testing/btest/Baseline.cpp/bifs.to_double_from_string/error
@@ -1,3 +1,3 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-error in <...>/to_double_from_string.zeek (C++), line 12: bad conversion to double (Users_vern_warehouse_zeek_zeek_master_02Mar23_testing_btest__tmp_bifs_to_double_from_string_to_double_from_string_zeek__global_stmts__zf() and NotADouble)
-error in <...>/to_double_from_string.zeek (C++), line 12: bad conversion to double (Users_vern_warehouse_zeek_zeek_master_02Mar23_testing_btest__tmp_bifs_to_double_from_string_to_double_from_string_zeek__global_stmts__zf() and )
+error in <...>/to_double_from_string.zeek (C++), line 12: bad conversion to double (<___>testing_btest__tmp_bifs_to_double_from_string_to_double_from_string_zeek__global_stmts__zf() and NotADouble)
+error in <...>/to_double_from_string.zeek (C++), line 12: bad conversion to double (<___>testing_btest__tmp_bifs_to_double_from_string_to_double_from_string_zeek__global_stmts__zf() and )
diff --git a/testing/btest/Baseline.cpp/bifs.to_subnet/error b/testing/btest/Baseline.cpp/bifs.to_subnet/error
index 8fac1a559b..770e88a8b9 100644
--- a/testing/btest/Baseline.cpp/bifs.to_subnet/error
+++ b/testing/btest/Baseline.cpp/bifs.to_subnet/error
@@ -1,4 +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_subnet.zeek (C++), line 6: failed converting string to IP prefix (Users_vern_warehouse_zeek_zeek_master_02Mar23_testing_btest__tmp_bifs_to_subnet_to_subnet_zeek__global_stmts__zf() and 10.0.0.0)
-error in <...>/to_subnet.zeek (C++), line 6: failed converting string to IP prefix (Users_vern_warehouse_zeek_zeek_master_02Mar23_testing_btest__tmp_bifs_to_subnet_to_subnet_zeek__global_stmts__zf() and 10.0.0.0/222)
-error in <...>/to_subnet.zeek (C++), line 6: failed converting string to IP prefix (Users_vern_warehouse_zeek_zeek_master_02Mar23_testing_btest__tmp_bifs_to_subnet_to_subnet_zeek__global_stmts__zf() and don't work)
+error in <...>/to_subnet.zeek (C++), line 6: failed converting string to IP prefix (<___>testing_btest__tmp_bifs_to_subnet_to_subnet_zeek__global_stmts__zf() and 10.0.0.0)
+error in <...>/to_subnet.zeek (C++), line 6: failed converting string to IP prefix (<___>testing_btest__tmp_bifs_to_subnet_to_subnet_zeek__global_stmts__zf() and 10.0.0.0/222)
+error in <...>/to_subnet.zeek (C++), line 6: failed converting string to IP prefix (<___>testing_btest__tmp_bifs_to_subnet_to_subnet_zeek__global_stmts__zf() and don't work)
diff --git a/testing/btest/Baseline.cpp/broker.store.create-failure/zeek.err b/testing/btest/Baseline.cpp/broker.store.create-failure/zeek.err
index 3ac75a6478..3215cff134 100644
--- a/testing/btest/Baseline.cpp/broker.store.create-failure/zeek.err
+++ b/testing/btest/Baseline.cpp/broker.store.create-failure/zeek.err
@@ -1,6 +1,6 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-error in <...>/create-failure.zeek (C++), line 61: Failed to attach master store backend_failure: (Users_vern_warehouse_zeek_zeek_master_02Mar23_testing_btest__tmp_broker_store_create_failure_create_failure_zeek__zeek_init__33__zf())
-error in <...>/create-failure.zeek (C++), line 61: Could not create Broker master store '../fail' (Users_vern_warehouse_zeek_zeek_master_02Mar23_testing_btest__tmp_broker_store_create_failure_create_failure_zeek__zeek_init__33__zf())
+error in <...>/create-failure.zeek (C++), line 61: Failed to attach master store backend_failure: (<___>testing_btest__tmp_broker_store_create_failure_create_failure_zeek__zeek_init__33__zf())
+error in <...>/create-failure.zeek (C++), line 61: Could not create Broker master store '../fail' (<___>testing_btest__tmp_broker_store_create_failure_create_failure_zeek__zeek_init__33__zf())
 error in <no location>: invalid Broker store handle (broker::store::{})
 error in <no location>: invalid Broker store handle (broker::store::{})
 error in <no location>: invalid Broker store handle (broker::store::{})
diff --git a/testing/scripts/diff-remove-abspath b/testing/scripts/diff-remove-abspath
index 979e3f532d..735c1130c1 100755
--- a/testing/scripts/diff-remove-abspath
+++ b/testing/scripts/diff-remove-abspath
@@ -9,4 +9,5 @@ else
 fi
 
 $sed 's#/+#/#g' |
+    $sed 's#[^( ]*testing_btest#<___>testing_btest#' |
     $sed 's#([a-zA-Z]:)?/([^	 :/]{1,}/){1,}([^	 :/]{1,})#<...>/\3#g'