diff --git a/testing/btest/Baseline.zam/broker.store.create-failure/zeek.err b/testing/btest/Baseline.zam/broker.store.create-failure/zeek.err
index d19ced9496..05fd841e54 100644
--- a/testing/btest/Baseline.zam/broker.store.create-failure/zeek.err
+++ b/testing/btest/Baseline.zam/broker.store.create-failure/zeek.err
@@ -1,9 +1,9 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-error in <...>/store.zeek, line 780: Failed to attach master store backend_failure: (Broker::__create_master(../fail, Broker::SQLITE, Broker::options.4))
-error in <...>/store.zeek, line 780: Could not create Broker master store '../fail' (Broker::__create_master(../fail, Broker::SQLITE, Broker::options.4))
+error in <...>/store.zeek, line 780: Failed to attach master store backend_failure: (Broker::__create_master(../fail, Broker::SQLITE, Broker::options.2))
+error in <...>/store.zeek, line 780: Could not create Broker master store '../fail' (Broker::__create_master(../fail, Broker::SQLITE, Broker::options.2))
 error in <...>/create-failure.zeek, line 49: invalid Broker store handle (Broker::keys(s) and broker::store::{})
-error in <...>/store.zeek, line 794: invalid Broker store handle (Broker::__close(Broker::h.14) and broker::store::{})
-error in <...>/store.zeek, line 794: invalid Broker store handle (Broker::__close(Broker::h.23) and broker::store::{})
+error in <...>/store.zeek, line 794: invalid Broker store handle (Broker::__close(Broker::h.12) and broker::store::{})
+error in <...>/store.zeek, line 794: invalid Broker store handle (Broker::__close(Broker::h.21) and broker::store::{})
 error in <...>/create-failure.zeek, line 49: invalid Broker store handle (Broker::keys(s) and broker::store::{})
 error in <...>/create-failure.zeek, line 49: invalid Broker store handle (Broker::keys(s) and broker::store::{})
 error in <...>/create-failure.zeek, line 49: invalid Broker store handle (Broker::keys(s) and broker::store::{})
diff --git a/testing/btest/Baseline.zam/spicy.analyzer-tag/output b/testing/btest/Baseline.zam/spicy.analyzer-tag/output
index d999b52c17..947980697b 100644
--- a/testing/btest/Baseline.zam/spicy.analyzer-tag/output
+++ b/testing/btest/Baseline.zam/spicy.analyzer-tag/output
@@ -1,6 +1,6 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 Have analyzer!
-tag: AllAnalyzers::ANALYZER_ANALYZER_SPICY_SSH
+tag: Analyzer::ANALYZER_SPICY_SSH
 name: SPICY_SSH
 
 Do not have analyzer!
diff --git a/testing/external/commit-hash.zeek-testing-private b/testing/external/commit-hash.zeek-testing-private
index 2772a42b88..7d5a17c1f8 100644
--- a/testing/external/commit-hash.zeek-testing-private
+++ b/testing/external/commit-hash.zeek-testing-private
@@ -1 +1 @@
-84059cf250af1277e01f16067570e8f535ad3573
+4aaaefe2797d8d0af2885b4076b482c644cd6b59