diff --git a/NEWS b/NEWS
index 1f1b14d3ba..6e7c4fb728 100644
--- a/NEWS
+++ b/NEWS
@@ -131,9 +131,8 @@ Changed Functionality
   This prevents callbacks into script-land through change handlers when parts
   of the environment have already been torn down.
 
-- When running in cluster mode, the manager by default now imports metrics
-  from all other cluster nodes via broker topics and opens port 9911/tcp for
-  Prometheus metrics exposition.
+- When running in cluster mode, the manager by default now imports metrics from
+  all other cluster nodes and opens port 9911/tcp for Prometheus metrics exposition.
 
 Removed Functionality
 ---------------------
diff --git a/testing/btest/Baseline/scripts.base.frameworks.telemetry.cluster/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.telemetry.cluster/manager-1..stdout
index 103742c1f1..f0734f656c 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.telemetry.cluster/manager-1..stdout
+++ b/testing/btest/Baseline/scripts.base.frameworks.telemetry.cluster/manager-1..stdout
@@ -1,2 +1,3 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+manager-1, original Broker::metrics_port, 9911/tcp
 [endpoint="logger-1", endpoint="manager-1", endpoint="proxy-1", endpoint="worker-1"]
diff --git a/testing/btest/scripts/base/frameworks/telemetry/cluster.zeek b/testing/btest/scripts/base/frameworks/telemetry/cluster.zeek
index d2efba0ecd..f71fdc1ad1 100644
--- a/testing/btest/scripts/base/frameworks/telemetry/cluster.zeek
+++ b/testing/btest/scripts/base/frameworks/telemetry/cluster.zeek
@@ -4,6 +4,8 @@
 # @TEST-PORT: BROKER_PORT2
 # @TEST-PORT: BROKER_PORT3
 # @TEST-PORT: BROKER_PORT4
+# @TEST-PORT: BROKER_PORT4
+# @TEST-PORT: BROKER_TEST_METRICS_PORT
 #
 # @TEST-REQUIRES: which curl
 # @TEST-EXEC: zeek --parse-only %INPUT
@@ -44,7 +46,7 @@ event run_test()
 
 		terminate();
 		}
-	timeout 3sec
+	timeout 10sec
 		{
 		# This is bad.
 		print "ERROR: HTTP request timeout";
@@ -54,6 +56,17 @@ event run_test()
 
 global node_count = 0;
 
+@if ( Cluster::node == "manager-1" )
+# Use a dynamic metrics port for testing to avoid colliding on 9911/tcp
+# when running tests in parallel.
+global orig_metrics_port = Broker::metrics_port;
+redef Broker::metrics_port = to_port(getenv("BROKER_TEST_METRICS_PORT"));
+
+event zeek_init()
+	{
+	print Cluster::node, "original Broker::metrics_port", orig_metrics_port;
+	}
+
 event Cluster::node_up(name: string, id: string)
 	{
 	++node_count;
@@ -63,6 +76,7 @@ event Cluster::node_up(name: string, id: string)
 		if ( node_count == 3 )
 			schedule 2 * Broker::metrics_export_interval { run_test() };
 	}
+@endif
 
 # If any node goes down, terminate() right away.
 event Cluster::node_down(name: string, id: string)