diff --git a/testing/external/commit-hash.zeek-testing b/testing/external/commit-hash.zeek-testing
index 55ea2df69b..8cb3481785 100644
--- a/testing/external/commit-hash.zeek-testing
+++ b/testing/external/commit-hash.zeek-testing
@@ -1 +1 @@
-cfc57a8a0513d8651c8946739e13ee0d8cfaad52
+68746d5bda1b50cbf80b476261765770a1aeba83
diff --git a/testing/external/commit-hash.zeek-testing-private b/testing/external/commit-hash.zeek-testing-private
index 946f9a9ef7..4ae08445e0 100644
--- a/testing/external/commit-hash.zeek-testing-private
+++ b/testing/external/commit-hash.zeek-testing-private
@@ -1 +1 @@
-4046d6322e1435851c4b17f9b6dfba63481e7e2b
+0bd4b26a4d93818c97dee3e66849de586066038b
diff --git a/testing/external/scripts/diff-all b/testing/external/scripts/diff-all
index ff82035c84..2c898be474 100755
--- a/testing/external/scripts/diff-all
+++ b/testing/external/scripts/diff-all
@@ -22,7 +22,7 @@ files_cwd=$(ls $@)
 files_baseline=$(cd $TEST_BASELINE && ls $@)
 
 for i in $(echo $files_cwd $files_baseline | sort | uniq); do
-    if [[ "$i" != "loaded_scripts.log" && "$i" != "prof.log" && "$i" != "debug.log" && "$i" != "stats.log" && "$i" != broker_*.log ]]; then
+    if [[ "$i" != "loaded_scripts.log" && "$i" != "prof.log" && "$i" != "debug.log" && "$i" != "stats.log" && "$i" != broker_*.log && "$i" != "telemetry.log" ]]; then
 
         if [[ "$i" == "reporter.log" ]]; then
             # Do not diff the reporter.log if it only complains about missing
diff --git a/testing/external/scripts/testing-setup.zeek b/testing/external/scripts/testing-setup.zeek
index 76656112c2..0f6ed20459 100644
--- a/testing/external/scripts/testing-setup.zeek
+++ b/testing/external/scripts/testing-setup.zeek
@@ -13,37 +13,6 @@
 	redef LogAscii::use_json = F;
 @endif
 
-# Exclude process metrics, they are non-deterministic.
-redef Telemetry::log_prefixes -= { "process" };
-
-# Increase default telemetry.log 30x to reduce log size
-# for traces spanning a long time period.
-redef Telemetry::log_interval = 1800sec;
-
-# Prevent the version_info metric from being logged as it's not deterministic.
-hook Telemetry::log_policy(rec: Telemetry::Info, id: Log::ID, filter: Log::Filter)
-	{
-	if ( rec$prefix == "zeek" && rec$name == "version_info" )
-		break;
-	}
-
-hook Telemetry::log_policy(rec: Telemetry::Info, id: Log::ID, filter: Log::Filter)
-	{
-	if ( rec$prefix != "zeek" )
-		return;
-
-	# Filter all event-handler-invocations entries from telemetry.log
-	# except those having something to do with connection_*
-	if ( rec$name == "event-handler-invocations" && /connection_.*/ !in cat(rec$label_values) )
-		break;
-
-	# Filter out the LoadedScripts stream due to platform dependent
-	# difference in the scripts loaded, and also filter out Telemetry
-	# log counts.
-	if ( rec$name == /log-.*/ && /LoadedScripts::LOG|Telemetry::LOG/ in cat(rec$label_values) )
-		break;
-	}
-
 # The IMAP analyzer includes absolute filenames in its error messages,
 # exclude it for now from analyzer.log.
 # https://github.com/zeek/zeek/issues/2659