diff --git a/testing/btest/Files/broker/cluster-layout.zeek b/testing/btest/Files/broker/cluster-layout.zeek
index f495e8da29..d8cc306386 100644
--- a/testing/btest/Files/broker/cluster-layout.zeek
+++ b/testing/btest/Files/broker/cluster-layout.zeek
@@ -19,6 +19,12 @@
 # to Cluster::nodes.
 
 
+# Using this testing cluster-layout.zeek switches Zeek to use Broker.
+#
+# This is side-loaded here to keep all existing tests that rely on
+# this Broker testing cluster setup to continue working.
+@load frameworks/cluster/backend/broker
+
 # Redef'ed to F if logger-1 or logger-2 are active.
 redef Cluster::manager_is_logger = T;
 
diff --git a/testing/btest/cluster/generic/cluster-publish-errors.zeek b/testing/btest/cluster/generic/cluster-publish-errors.zeek
index 5e106012a0..25cc5cd733 100644
--- a/testing/btest/cluster/generic/cluster-publish-errors.zeek
+++ b/testing/btest/cluster/generic/cluster-publish-errors.zeek
@@ -1,7 +1,7 @@
 # @TEST-DOC: Test errors of cluster bifs
 #
 # @TEST-EXEC: zeek --parse-only -b %INPUT
-# @TEST-EXEC: zeek -b %INPUT
+# @TEST-EXEC: zeek -b %INPUT frameworks/cluster/backend/broker
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stdout
 
diff --git a/testing/btest/cluster/websocket/terminate-while-queuing.zeek b/testing/btest/cluster/websocket/terminate-while-queuing.zeek
index 787f02671a..1a057ec983 100644
--- a/testing/btest/cluster/websocket/terminate-while-queuing.zeek
+++ b/testing/btest/cluster/websocket/terminate-while-queuing.zeek
@@ -19,6 +19,9 @@
 # @TEST-EXEC: btest-diff ./client/.stderr
 
 # @TEST-START-FILE manager.zeek
+
+@load frameworks/cluster/backend/broker
+
 redef exit_only_after_terminate = T;
 
 # Force dispatcher queue being full quickly!
diff --git a/testing/btest/core/suspend_processing/websocket.zeek b/testing/btest/core/suspend_processing/websocket.zeek
index 631d57dd95..4201014673 100644
--- a/testing/btest/core/suspend_processing/websocket.zeek
+++ b/testing/btest/core/suspend_processing/websocket.zeek
@@ -15,6 +15,8 @@
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff worker/.stdout
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff client/.stdout
 
+@load frameworks/cluster/backend/broker
+
 global my_new_connection: event(uid: string, c: count);
 
 event zeek_init()
diff --git a/testing/btest/plugins/publish-event-hook.zeek b/testing/btest/plugins/publish-event-hook.zeek
index 704a1ccc59..c5efda7caa 100644
--- a/testing/btest/plugins/publish-event-hook.zeek
+++ b/testing/btest/plugins/publish-event-hook.zeek
@@ -4,8 +4,9 @@
 # @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -b Demo::PublishEvent %INPUT > output
 # @TEST-EXEC: btest-diff output
 
-redef allow_network_time_forward = F;
+@load frameworks/cluster/backend/broker
 
+redef allow_network_time_forward = F;
 
 module App;
 
diff --git a/testing/btest/scripts/base/frameworks/control/configuration_update.zeek b/testing/btest/scripts/base/frameworks/control/configuration_update.zeek
index d2507f7ee3..2afe60c0a8 100644
--- a/testing/btest/scripts/base/frameworks/control/configuration_update.zeek
+++ b/testing/btest/scripts/base/frameworks/control/configuration_update.zeek
@@ -5,6 +5,8 @@
 # @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff controllee/.stdout
 
+@load frameworks/cluster/backend/broker
+
 @load base/frameworks/control
 
 const test_var = "ORIGINAL VALUE (this should be printed out first)" &redef;
diff --git a/testing/btest/scripts/base/frameworks/control/id_value.zeek b/testing/btest/scripts/base/frameworks/control/id_value.zeek
index c12d137c6a..33e8b525cf 100644
--- a/testing/btest/scripts/base/frameworks/control/id_value.zeek
+++ b/testing/btest/scripts/base/frameworks/control/id_value.zeek
@@ -9,6 +9,8 @@
 # @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff controller/.stdout
 
+@load frameworks/cluster/backend/broker
+
 @load base/frameworks/control
 
 # This value shouldn't ever be printed to the controllers stdout.
diff --git a/testing/btest/scripts/base/frameworks/control/shutdown.zeek b/testing/btest/scripts/base/frameworks/control/shutdown.zeek
index 832ca8a591..3741cf98df 100644
--- a/testing/btest/scripts/base/frameworks/control/shutdown.zeek
+++ b/testing/btest/scripts/base/frameworks/control/shutdown.zeek
@@ -4,3 +4,5 @@
 # @TEST-EXEC: btest-bg-run controller ZEEKPATH=$ZEEKPATH:.. zeek -b %INPUT frameworks/control/controller Control::host=127.0.0.1 Control::host_port=$BROKER_PORT Control::cmd=shutdown
 # @TEST-EXEC: btest-bg-wait 20
 
+@load frameworks/cluster/backend/broker
+
diff --git a/testing/btest/scripts/base/frameworks/logging/length-checking.zeek b/testing/btest/scripts/base/frameworks/logging/length-checking.zeek
index 95e966c3d6..cee6e8cc25 100644
--- a/testing/btest/scripts/base/frameworks/logging/length-checking.zeek
+++ b/testing/btest/scripts/base/frameworks/logging/length-checking.zeek
@@ -17,6 +17,9 @@
 # @TEST-START-FILE common.zeek
 @load base/frameworks/notice/weird
 
+# Ensure logging is done via Broker
+@load frameworks/cluster/backend/broker
+
 module Test;
 
 # Disable the string and container length filtering.
diff --git a/testing/btest/scripts/policy/frameworks/cluster/cluster_started_restart_manager.zeek b/testing/btest/scripts/policy/frameworks/cluster/cluster_started_restart_manager.zeek
index fcc9f7e3e9..a762121483 100644
--- a/testing/btest/scripts/policy/frameworks/cluster/cluster_started_restart_manager.zeek
+++ b/testing/btest/scripts/policy/frameworks/cluster/cluster_started_restart_manager.zeek
@@ -12,6 +12,7 @@
 # @TEST-EXEC: btest-diff zeek/worker-1/stdout
 # @TEST-EXEC: btest-diff zeek/proxy-1/stdout
 
+@load frameworks/cluster/backend/broker
 @load policy/frameworks/cluster/experimental
 
 # So the supervised node doesn't terminate right away.
diff --git a/testing/btest/scripts/policy/frameworks/cluster/cluster_started_restart_worker.zeek b/testing/btest/scripts/policy/frameworks/cluster/cluster_started_restart_worker.zeek
index 457d34db11..112559c10c 100644
--- a/testing/btest/scripts/policy/frameworks/cluster/cluster_started_restart_worker.zeek
+++ b/testing/btest/scripts/policy/frameworks/cluster/cluster_started_restart_worker.zeek
@@ -13,6 +13,7 @@
 # @TEST-EXEC: btest-diff zeek/worker-2/stdout
 # @TEST-EXEC: btest-diff zeek/proxy-1/stdout
 
+@load frameworks/cluster/backend/broker
 @load policy/frameworks/cluster/experimental
 
 # So the supervised node doesn't terminate right away.
diff --git a/testing/btest/scripts/policy/frameworks/telemetry/prometheus.zeek b/testing/btest/scripts/policy/frameworks/telemetry/prometheus.zeek
index 9b09784e1f..aeef3df959 100644
--- a/testing/btest/scripts/policy/frameworks/telemetry/prometheus.zeek
+++ b/testing/btest/scripts/policy/frameworks/telemetry/prometheus.zeek
@@ -55,6 +55,7 @@ for host in $(echo ${services_data} | jq -r '.[0].targets[]' | sort); do
 done
 # @TEST-END-FILE
 
+@load policy/frameworks/cluster/backend/broker
 @load policy/frameworks/cluster/experimental
 @load base/frameworks/telemetry
 
diff --git a/testing/btest/supervisor/config-cluster.zeek b/testing/btest/supervisor/config-cluster.zeek
index f551ec5044..ebdaaf7019 100644
--- a/testing/btest/supervisor/config-cluster.zeek
+++ b/testing/btest/supervisor/config-cluster.zeek
@@ -11,6 +11,7 @@
 # @TEST-EXEC: btest-diff zeek/worker-1/stdout
 # @TEST-EXEC: btest-diff zeek/proxy-1/stdout
 
+@load policy/frameworks/cluster/backend/broker
 @load policy/frameworks/cluster/experimental
 
 # So the supervised node doesn't terminate right away.