diff --git a/testing/btest/Baseline/cluster.websocket.broker.manager-recvs/..client..stderr b/testing/btest/Baseline/cluster.websocket.broker.manager-recvs/..client..stderr
new file mode 100644
index 0000000000..49d861c74c
--- /dev/null
+++ b/testing/btest/Baseline/cluster.websocket.broker.manager-recvs/..client..stderr
@@ -0,0 +1 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
diff --git a/testing/btest/Baseline/cluster.websocket.broker.manager-recvs/..client..stdout b/testing/btest/Baseline/cluster.websocket.broker.manager-recvs/..client..stdout
new file mode 100644
index 0000000000..1de9978b19
--- /dev/null
+++ b/testing/btest/Baseline/cluster.websocket.broker.manager-recvs/..client..stdout
@@ -0,0 +1,29 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+Connected!
+{"client": "ws1", "timeout": true}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "ws1-1"}, {"@data-type": "count", "data": 101}]}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "ws1-1"}, {"@data-type": "count", "data": 101}]}
+{"client": "ws1", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "ws2-1"}, {"@data-type": "count", "data": 201}]}
+{"client": "ws2", "timeout": true}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "ws2-1"}, {"@data-type": "count", "data": 201}]}
+{"client": "ws1", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "ws3-1"}, {"@data-type": "count", "data": 301}]}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "ws3-1"}, {"@data-type": "count", "data": 301}]}
+{"client": "ws3", "timeout": true}
+{"client": "ws1", "timeout": true}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "ws1-2"}, {"@data-type": "count", "data": 102}]}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "ws1-2"}, {"@data-type": "count", "data": 102}]}
+{"client": "ws1", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "ws2-2"}, {"@data-type": "count", "data": 202}]}
+{"client": "ws2", "timeout": true}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "ws2-2"}, {"@data-type": "count", "data": 202}]}
+{"client": "ws1", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "ws3-2"}, {"@data-type": "count", "data": 302}]}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "ws3-2"}, {"@data-type": "count", "data": 302}]}
+{"client": "ws3", "timeout": true}
+{"client": "ws1", "timeout": true}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "ws1-3"}, {"@data-type": "count", "data": 103}]}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "ws1-3"}, {"@data-type": "count", "data": 103}]}
+{"client": "ws1", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "ws2-3"}, {"@data-type": "count", "data": 203}]}
+{"client": "ws2", "timeout": true}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "ws2-3"}, {"@data-type": "count", "data": 203}]}
+{"client": "ws1", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "ws3-3"}, {"@data-type": "count", "data": 303}]}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "ws3-3"}, {"@data-type": "count", "data": 303}]}
+{"client": "ws3", "timeout": true}
diff --git a/testing/btest/Baseline/cluster.websocket.broker.manager-recvs/..manager..stderr b/testing/btest/Baseline/cluster.websocket.broker.manager-recvs/..manager..stderr
new file mode 100644
index 0000000000..e3f6131b1d
--- /dev/null
+++ b/testing/btest/Baseline/cluster.websocket.broker.manager-recvs/..manager..stderr
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+received termination signal
diff --git a/testing/btest/Baseline/cluster.websocket.broker.manager-recvs/..manager..stdout b/testing/btest/Baseline/cluster.websocket.broker.manager-recvs/..manager..stdout
new file mode 100644
index 0000000000..658bfd481a
--- /dev/null
+++ b/testing/btest/Baseline/cluster.websocket.broker.manager-recvs/..manager..stdout
@@ -0,0 +1,17 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+XXXXXXXXXX.XXXXXX: Cluster::websocket_client_added 1 [/test/pings/, /zeek/wstest/ws1/]
+XXXXXXXXXX.XXXXXX: Cluster::websocket_client_added 2 [/test/pings/, /zeek/wstest/ws2/]
+XXXXXXXXXX.XXXXXX: Cluster::websocket_client_added 3 [/test/pings/, /zeek/wstest/ws3/]
+XXXXXXXXXX.XXXXXX: got ping: ws1-1, 101
+XXXXXXXXXX.XXXXXX: got ping: ws2-1, 201
+XXXXXXXXXX.XXXXXX: got ping: ws3-1, 301
+XXXXXXXXXX.XXXXXX: got ping: ws1-2, 102
+XXXXXXXXXX.XXXXXX: got ping: ws2-2, 202
+XXXXXXXXXX.XXXXXX: got ping: ws3-2, 302
+XXXXXXXXXX.XXXXXX: got ping: ws1-3, 103
+XXXXXXXXXX.XXXXXX: got ping: ws2-3, 203
+XXXXXXXXXX.XXXXXX: got ping: ws3-3, 303
+XXXXXXXXXX.XXXXXX: Cluster::websocket_client_lost 1
+XXXXXXXXXX.XXXXXX: Cluster::websocket_client_lost 2
+XXXXXXXXXX.XXXXXX: Cluster::websocket_client_lost 3
+XXXXXXXXXX.XXXXXX, terminate()
diff --git a/testing/btest/Baseline/cluster.websocket.broker.manager-sends/..client..stderr b/testing/btest/Baseline/cluster.websocket.broker.manager-sends/..client..stderr
new file mode 100644
index 0000000000..49d861c74c
--- /dev/null
+++ b/testing/btest/Baseline/cluster.websocket.broker.manager-sends/..client..stderr
@@ -0,0 +1 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
diff --git a/testing/btest/Baseline/cluster.websocket.broker.manager-sends/..client..stdout b/testing/btest/Baseline/cluster.websocket.broker.manager-sends/..client..stdout
new file mode 100644
index 0000000000..3dcbb9698e
--- /dev/null
+++ b/testing/btest/Baseline/cluster.websocket.broker.manager-sends/..client..stdout
@@ -0,0 +1,11 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+Connected!
+{"client": "ws1", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "from-manager"}, {"@data-type": "count", "data": 1}]}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "from-manager"}, {"@data-type": "count", "data": 1}]}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "from-manager"}, {"@data-type": "count", "data": 1}]}
+{"client": "ws1", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "from-manager"}, {"@data-type": "count", "data": 2}]}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "from-manager"}, {"@data-type": "count", "data": 2}]}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "from-manager"}, {"@data-type": "count", "data": 2}]}
+{"client": "ws1", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "from-manager"}, {"@data-type": "count", "data": 3}]}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "from-manager"}, {"@data-type": "count", "data": 3}]}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "from-manager"}, {"@data-type": "count", "data": 3}]}
diff --git a/testing/btest/Baseline/cluster.websocket.broker.manager-sends/..manager..stderr b/testing/btest/Baseline/cluster.websocket.broker.manager-sends/..manager..stderr
new file mode 100644
index 0000000000..e3f6131b1d
--- /dev/null
+++ b/testing/btest/Baseline/cluster.websocket.broker.manager-sends/..manager..stderr
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+received termination signal
diff --git a/testing/btest/Baseline/cluster.websocket.broker.manager-sends/..manager..stdout b/testing/btest/Baseline/cluster.websocket.broker.manager-sends/..manager..stdout
new file mode 100644
index 0000000000..75a6726e28
--- /dev/null
+++ b/testing/btest/Baseline/cluster.websocket.broker.manager-sends/..manager..stdout
@@ -0,0 +1,11 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+XXXXXXXXXX.XXXXXX: Cluster::websocket_client_added 1 [/test/pings/, /zeek/wstest/ws1/]
+XXXXXXXXXX.XXXXXX: Cluster::websocket_client_added 2 [/test/pings/, /zeek/wstest/ws2/]
+XXXXXXXXXX.XXXXXX: Cluster::websocket_client_added 3 [/test/pings/, /zeek/wstest/ws3/]
+XXXXXXXXXX.XXXXXX: sending ping 1
+XXXXXXXXXX.XXXXXX: sending ping 2
+XXXXXXXXXX.XXXXXX: sending ping 3
+XXXXXXXXXX.XXXXXX: Cluster::websocket_client_lost 1
+XXXXXXXXXX.XXXXXX: Cluster::websocket_client_lost 2
+XXXXXXXXXX.XXXXXX: Cluster::websocket_client_lost 3
+XXXXXXXXXX.XXXXXX, terminate()
diff --git a/testing/btest/Baseline/cluster.websocket.broker.manager-worker-ping-pong/..client..stderr b/testing/btest/Baseline/cluster.websocket.broker.manager-worker-ping-pong/..client..stderr
new file mode 100644
index 0000000000..49d861c74c
--- /dev/null
+++ b/testing/btest/Baseline/cluster.websocket.broker.manager-worker-ping-pong/..client..stderr
@@ -0,0 +1 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
diff --git a/testing/btest/Baseline/cluster.websocket.broker.manager-worker-ping-pong/..client..stdout b/testing/btest/Baseline/cluster.websocket.broker.manager-worker-ping-pong/..client..stdout
new file mode 100644
index 0000000000..b5baf120ef
--- /dev/null
+++ b/testing/btest/Baseline/cluster.websocket.broker.manager-worker-ping-pong/..client..stdout
@@ -0,0 +1,66 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+Connected!
+unique ids 3
+recv_until_timeout: tc1 - ping 1
+{"client": "ws1", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "worker-1 reply for ping(to-worker, 101)"}, {"@data-type": "count", "data": 1}]}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "to-worker"}, {"@data-type": "count", "data": 101}]}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "to-worker"}, {"@data-type": "count", "data": 101}]}
+{"client": "ws1", "timeout": true}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "worker-1 reply for ping(to-worker, 101)"}, {"@data-type": "count", "data": 1}]}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "worker-1 reply for ping(to-worker, 101)"}, {"@data-type": "count", "data": 1}]}
+recv_until_timeout: tc2 - ping 1
+{"client": "ws1", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "to-worker"}, {"@data-type": "count", "data": 201}]}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "worker-1 reply for ping(to-worker, 201)"}, {"@data-type": "count", "data": 2}]}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "to-worker"}, {"@data-type": "count", "data": 201}]}
+{"client": "ws1", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "worker-1 reply for ping(to-worker, 201)"}, {"@data-type": "count", "data": 2}]}
+{"client": "ws2", "timeout": true}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "worker-1 reply for ping(to-worker, 201)"}, {"@data-type": "count", "data": 2}]}
+recv_until_timeout: tc3 - ping 1
+{"client": "ws1", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "to-worker"}, {"@data-type": "count", "data": 301}]}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "to-worker"}, {"@data-type": "count", "data": 301}]}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "worker-1 reply for ping(to-worker, 301)"}, {"@data-type": "count", "data": 3}]}
+{"client": "ws1", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "worker-1 reply for ping(to-worker, 301)"}, {"@data-type": "count", "data": 3}]}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "worker-1 reply for ping(to-worker, 301)"}, {"@data-type": "count", "data": 3}]}
+{"client": "ws3", "timeout": true}
+recv_until_timeout: tc1 - ping 2
+{"client": "ws1", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "manager reply for ping(to-manager, 102)"}, {"@data-type": "count", "data": 4}]}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "to-manager"}, {"@data-type": "count", "data": 102}]}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "to-manager"}, {"@data-type": "count", "data": 102}]}
+{"client": "ws1", "timeout": true}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "manager reply for ping(to-manager, 102)"}, {"@data-type": "count", "data": 4}]}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "manager reply for ping(to-manager, 102)"}, {"@data-type": "count", "data": 4}]}
+recv_until_timeout: tc2 - ping 2
+{"client": "ws1", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "to-manager"}, {"@data-type": "count", "data": 202}]}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "manager reply for ping(to-manager, 202)"}, {"@data-type": "count", "data": 5}]}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "to-manager"}, {"@data-type": "count", "data": 202}]}
+{"client": "ws1", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "manager reply for ping(to-manager, 202)"}, {"@data-type": "count", "data": 5}]}
+{"client": "ws2", "timeout": true}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "manager reply for ping(to-manager, 202)"}, {"@data-type": "count", "data": 5}]}
+recv_until_timeout: tc3 - ping 2
+{"client": "ws1", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "to-manager"}, {"@data-type": "count", "data": 302}]}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "to-manager"}, {"@data-type": "count", "data": 302}]}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "manager reply for ping(to-manager, 302)"}, {"@data-type": "count", "data": 6}]}
+{"client": "ws1", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "manager reply for ping(to-manager, 302)"}, {"@data-type": "count", "data": 6}]}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "manager reply for ping(to-manager, 302)"}, {"@data-type": "count", "data": 6}]}
+{"client": "ws3", "timeout": true}
+recv_until_timeout: tc1 - ping 3
+{"client": "ws1", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "worker-1 reply for ping(to-worker, 103)"}, {"@data-type": "count", "data": 7}]}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "to-worker"}, {"@data-type": "count", "data": 103}]}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "to-worker"}, {"@data-type": "count", "data": 103}]}
+{"client": "ws1", "timeout": true}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "worker-1 reply for ping(to-worker, 103)"}, {"@data-type": "count", "data": 7}]}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "worker-1 reply for ping(to-worker, 103)"}, {"@data-type": "count", "data": 7}]}
+recv_until_timeout: tc2 - ping 3
+{"client": "ws1", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "to-worker"}, {"@data-type": "count", "data": 203}]}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "worker-1 reply for ping(to-worker, 203)"}, {"@data-type": "count", "data": 8}]}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "to-worker"}, {"@data-type": "count", "data": 203}]}
+{"client": "ws1", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "worker-1 reply for ping(to-worker, 203)"}, {"@data-type": "count", "data": 8}]}
+{"client": "ws2", "timeout": true}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "worker-1 reply for ping(to-worker, 203)"}, {"@data-type": "count", "data": 8}]}
+recv_until_timeout: tc3 - ping 3
+{"client": "ws1", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "to-worker"}, {"@data-type": "count", "data": 303}]}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "ping", "event_args": [{"@data-type": "string", "data": "to-worker"}, {"@data-type": "count", "data": 303}]}
+{"client": "ws3", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "worker-1 reply for ping(to-worker, 303)"}, {"@data-type": "count", "data": 9}]}
+{"client": "ws1", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "worker-1 reply for ping(to-worker, 303)"}, {"@data-type": "count", "data": 9}]}
+{"client": "ws2", "topic": "/test/pings/", "event_name": "pong", "event_args": [{"@data-type": "string", "data": "worker-1 reply for ping(to-worker, 303)"}, {"@data-type": "count", "data": 9}]}
+{"client": "ws3", "timeout": true}
diff --git a/testing/btest/Baseline/cluster.websocket.broker.manager-worker-ping-pong/..manager..stderr b/testing/btest/Baseline/cluster.websocket.broker.manager-worker-ping-pong/..manager..stderr
new file mode 100644
index 0000000000..e3f6131b1d
--- /dev/null
+++ b/testing/btest/Baseline/cluster.websocket.broker.manager-worker-ping-pong/..manager..stderr
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+received termination signal
diff --git a/testing/btest/Baseline/cluster.websocket.broker.manager-worker-ping-pong/..manager..stdout b/testing/btest/Baseline/cluster.websocket.broker.manager-worker-ping-pong/..manager..stdout
new file mode 100644
index 0000000000..fb3a8125af
--- /dev/null
+++ b/testing/btest/Baseline/cluster.websocket.broker.manager-worker-ping-pong/..manager..stdout
@@ -0,0 +1,24 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+XXXXXXXXXX.XXXXXX: Cluster::node_up worker-1
+XXXXXXXXXX.XXXXXX: Cluster::websocket_client_added 1 [/test/pings/, /zeek/wstest/ws1/]
+XXXXXXXXXX.XXXXXX: Cluster::websocket_client_added 2 [/test/pings/, /zeek/wstest/ws2/]
+XXXXXXXXXX.XXXXXX: Cluster::websocket_client_added 3 [/test/pings/, /zeek/wstest/ws3/]
+XXXXXXXXXX.XXXXXX: got ping: to-worker, 101
+XXXXXXXXXX.XXXXXX: got pong: worker-1 reply for ping(to-worker, 101), 1
+XXXXXXXXXX.XXXXXX: got ping: to-worker, 201
+XXXXXXXXXX.XXXXXX: got pong: worker-1 reply for ping(to-worker, 201), 2
+XXXXXXXXXX.XXXXXX: got ping: to-worker, 301
+XXXXXXXXXX.XXXXXX: got pong: worker-1 reply for ping(to-worker, 301), 3
+XXXXXXXXXX.XXXXXX: got ping: to-manager, 102
+XXXXXXXXXX.XXXXXX: got ping: to-manager, 202
+XXXXXXXXXX.XXXXXX: got ping: to-manager, 302
+XXXXXXXXXX.XXXXXX: got ping: to-worker, 103
+XXXXXXXXXX.XXXXXX: got pong: worker-1 reply for ping(to-worker, 103), 7
+XXXXXXXXXX.XXXXXX: got ping: to-worker, 203
+XXXXXXXXXX.XXXXXX: got pong: worker-1 reply for ping(to-worker, 203), 8
+XXXXXXXXXX.XXXXXX: got ping: to-worker, 303
+XXXXXXXXXX.XXXXXX: got pong: worker-1 reply for ping(to-worker, 303), 9
+XXXXXXXXXX.XXXXXX: Cluster::websocket_client_lost 1
+XXXXXXXXXX.XXXXXX: Cluster::websocket_client_lost 2
+XXXXXXXXXX.XXXXXX: Cluster::websocket_client_lost 3
+XXXXXXXXXX.XXXXXX: terminate()
diff --git a/testing/btest/Baseline/cluster.websocket.broker.manager-worker-ping-pong/..worker-1..stderr b/testing/btest/Baseline/cluster.websocket.broker.manager-worker-ping-pong/..worker-1..stderr
new file mode 100644
index 0000000000..e3f6131b1d
--- /dev/null
+++ b/testing/btest/Baseline/cluster.websocket.broker.manager-worker-ping-pong/..worker-1..stderr
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+received termination signal
diff --git a/testing/btest/Baseline/cluster.websocket.broker.manager-worker-ping-pong/..worker-1..stdout b/testing/btest/Baseline/cluster.websocket.broker.manager-worker-ping-pong/..worker-1..stdout
new file mode 100644
index 0000000000..5d456ba8b8
--- /dev/null
+++ b/testing/btest/Baseline/cluster.websocket.broker.manager-worker-ping-pong/..worker-1..stdout
@@ -0,0 +1,15 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+XXXXXXXXXX.XXXXXX: Cluster::node_up manager
+XXXXXXXXXX.XXXXXX: got ping: to-worker, 101
+XXXXXXXXXX.XXXXXX: got ping: to-worker, 201
+XXXXXXXXXX.XXXXXX: got ping: to-worker, 301
+XXXXXXXXXX.XXXXXX: got ping: to-manager, 102
+XXXXXXXXXX.XXXXXX: got pong: manager reply for ping(to-manager, 102), 4
+XXXXXXXXXX.XXXXXX: got ping: to-manager, 202
+XXXXXXXXXX.XXXXXX: got pong: manager reply for ping(to-manager, 202), 5
+XXXXXXXXXX.XXXXXX: got ping: to-manager, 302
+XXXXXXXXXX.XXXXXX: got pong: manager reply for ping(to-manager, 302), 6
+XXXXXXXXXX.XXXXXX: got ping: to-worker, 103
+XXXXXXXXXX.XXXXXX: got ping: to-worker, 203
+XXXXXXXXXX.XXXXXX: got ping: to-worker, 303
+XXXXXXXXXX.XXXXXX: Cluster::node_down manager
diff --git a/testing/btest/cluster/websocket/broker/manager-recvs.zeek b/testing/btest/cluster/websocket/broker/manager-recvs.zeek
new file mode 100644
index 0000000000..eaaf6e9127
--- /dev/null
+++ b/testing/btest/cluster/websocket/broker/manager-recvs.zeek
@@ -0,0 +1,108 @@
+# @TEST-DOC: Test visibility of endpoint messages at websocket clients.
+#
+# Manager opens a websocket port, waits for three clients, each of the clients
+# sends 3 ping messages. The manager observes them all.
+#
+# @TEST-REQUIRES: python3 -c 'import websockets.sync'
+#
+# @TEST-PORT: BROKER_PORT1
+# @TEST-PORT: WEBSOCKET_PORT
+#
+# @TEST-EXEC: cp $FILES/ws/wstest.py .
+#
+# @TEST-EXEC: zeek -b --parse-only manager.zeek
+# @TEST-EXEC: python3 -m py_compile client.py
+#
+# @TEST-EXEC: btest-bg-run manager "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=manager zeek -b ../manager.zeek"
+# @TEST-EXEC: btest-bg-run client "python3 ../client.py"
+#
+# @TEST-EXEC: btest-bg-wait 30
+# @TEST-EXEC: btest-diff ./manager/.stdout
+# @TEST-EXEC: TEST_DIFF_CANONIFIER='grep -v "Error reading HTTP request line"' btest-diff ./manager/.stderr
+# @TEST-EXEC: btest-diff ./client/.stdout
+# @TEST-EXEC: btest-diff ./client/.stderr
+
+# @TEST-START-FILE cluster-layout.zeek
+redef Cluster::nodes = {
+	["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
+};
+# @TEST-END-FILE
+
+# @TEST-START-FILE manager.zeek
+redef Log::enable_local_logging = T;
+redef Log::default_rotation_interval = 0sec;
+
+global ping: event(msg: string, c: count) &is_used;
+
+global ping_count = 0;
+
+redef Broker::disable_ssl = T;
+
+global added = 0;
+global lost = 0;
+
+event zeek_init()
+	{
+	Cluster::subscribe("/test/pings/");
+
+	Cluster::listen_websocket([
+		$listen_host="127.0.0.1",
+		$listen_port=to_port(getenv("WEBSOCKET_PORT")),
+	]);
+	}
+
+event ping(msg: string, n: count) &is_used
+	{
+        ++ping_count;
+	print fmt("%s: got ping: %s, %s", current_time(), msg, n);
+	}
+
+event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions: string_vec)
+	{
+	++added;
+	print fmt("%s: Cluster::websocket_client_added %s %s", current_time(), added, subscriptions);
+	}
+
+event Cluster::websocket_client_lost(info: Cluster::EndpointInfo)
+	{
+	++lost;
+	print fmt("%s: Cluster::websocket_client_lost %s", current_time(), lost);
+	if ( lost == 3 )
+		{
+		print current_time(), "terminate()";
+		terminate();
+		}
+	}
+# @TEST-END-FILE
+
+
+# @TEST-START-FILE client.py
+import wstest
+
+def run(ws_url):
+    with (
+        wstest.connect("ws1", ws_url) as tc1,
+        wstest.connect("ws2", ws_url) as tc2,
+        wstest.connect("ws3", ws_url) as tc3,
+    ):
+        clients = [tc1, tc2, tc3]
+        print("Connected!")
+        ids = set()
+        for tc in clients:
+            ack = tc.hello_v1(["/test/pings/"])
+            ids.add(ack["endpoint"])
+
+            # Send 3x3 pings to the manager and consume the messages
+            # to the clients as well.
+        for i in range(1, 4):
+           tc1.send_json(wstest.build_event_v1("/test/pings/", "ping", [f"ws1-{i}", 100 + i]))
+           wstest.recv_until_timeout(clients)
+           tc2.send_json(wstest.build_event_v1("/test/pings/", "ping", [f"ws2-{i}", 200 + i]))
+           wstest.recv_until_timeout(clients)
+           tc3.send_json(wstest.build_event_v1("/test/pings/", "ping", [f"ws3-{i}", 300 + i]))
+           wstest.recv_until_timeout(clients)
+
+
+if __name__ == "__main__":
+    wstest.main(run, wstest.WS4_URL_V1)
+# @TEST-END-FILE
diff --git a/testing/btest/cluster/websocket/broker/manager-sends.zeek b/testing/btest/cluster/websocket/broker/manager-sends.zeek
new file mode 100644
index 0000000000..51e396ac54
--- /dev/null
+++ b/testing/btest/cluster/websocket/broker/manager-sends.zeek
@@ -0,0 +1,105 @@
+# @TEST-DOC: Test visibility of endpoint messages at websocket clients.
+#
+# Manager opens a websocket port, waits for three clients, sends 3 ping messages,
+# the clients observe the manager's messages.
+#
+# @TEST-REQUIRES: python3 -c 'import websockets.sync'
+#
+# @TEST-PORT: BROKER_PORT1
+# @TEST-PORT: WEBSOCKET_PORT
+#
+# @TEST-EXEC: cp $FILES/ws/wstest.py .
+#
+# @TEST-EXEC: zeek -b --parse-only manager.zeek
+# @TEST-EXEC: python3 -m py_compile client.py
+#
+# @TEST-EXEC: btest-bg-run manager "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=manager zeek -b ../manager.zeek"
+# @TEST-EXEC: btest-bg-run client "python3 ../client.py"
+#
+# @TEST-EXEC: btest-bg-wait 30
+# @TEST-EXEC: btest-diff ./manager/.stdout
+# @TEST-EXEC: TEST_DIFF_CANONIFIER='grep -v "Error reading HTTP request line"' btest-diff ./manager/.stderr
+# @TEST-EXEC: btest-diff ./client/.stdout
+# @TEST-EXEC: btest-diff ./client/.stderr
+
+# @TEST-START-FILE cluster-layout.zeek
+redef Cluster::nodes = {
+	["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
+};
+# @TEST-END-FILE
+
+# @TEST-START-FILE manager.zeek
+redef Log::enable_local_logging = T;
+redef Log::default_rotation_interval = 0sec;
+
+global ping: event(msg: string, c: count) &is_used;
+
+global ping_count = 0;
+
+redef Broker::disable_ssl = T;
+
+global added = 0;
+global lost = 0;
+
+event zeek_init()
+	{
+	Cluster::listen_websocket([
+		$listen_host="127.0.0.1",
+		$listen_port=to_port(getenv("WEBSOCKET_PORT")),
+	]);
+	}
+
+event send_ping()
+	{
+	++ping_count;
+	print fmt("%s: sending ping %s", current_time(), ping_count);
+	Cluster::publish("/test/pings/", ping, "from-manager", ping_count);
+	if ( ping_count < 3 )
+		event send_ping();
+	}
+
+event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions: string_vec)
+	{
+	++added;
+	print fmt("%s: Cluster::websocket_client_added %s %s", current_time(), added, subscriptions);
+	if ( added == 3 )
+		event send_ping();
+	}
+
+event Cluster::websocket_client_lost(info: Cluster::EndpointInfo)
+	{
+	++lost;
+	print fmt("%s: Cluster::websocket_client_lost %s", current_time(), lost);
+
+	if ( lost == 3 )
+		{
+		print current_time(), "terminate()";
+		terminate();
+		}
+	}
+# @TEST-END-FILE
+
+
+# @TEST-START-FILE client.py
+import wstest
+
+def run(ws_url):
+    with (
+        wstest.connect("ws1", ws_url) as tc1,
+        wstest.connect("ws2", ws_url) as tc2,
+        wstest.connect("ws3", ws_url) as tc3,
+    ):
+        clients = [tc1, tc2, tc3]
+        print("Connected!")
+        ids = set()
+        for tc in clients:
+            ack = tc.hello_v1(["/test/pings/"])
+            ids.add(ack["endpoint"])
+
+        # The manager should send 3 pings in a row, receive them all.
+        wstest.recv_until_timeout(clients, timeout=0.5)
+
+
+if __name__ == "__main__":
+    wstest.main(run, wstest.WS4_URL_V1)
+# @TEST-END-FILE
diff --git a/testing/btest/cluster/websocket/broker/manager-worker-ping-pong.zeek b/testing/btest/cluster/websocket/broker/manager-worker-ping-pong.zeek
new file mode 100644
index 0000000000..c1a63892e6
--- /dev/null
+++ b/testing/btest/cluster/websocket/broker/manager-worker-ping-pong.zeek
@@ -0,0 +1,158 @@
+# @TEST-DOC: Test visibility of WebSockets client's messages when the Broker cluster backend is used.
+#
+# Worker peers with a manager, manager opens a websocket port, three websocket clients connect.
+#
+# Expectations:
+#
+# * ping events from one websocket client are received by manager, worker, and the other websocket clients
+# * pong events from manager and worker are received by all websocket clients and worker or manager
+#
+# @TEST-REQUIRES: python3 -c 'import websockets.sync'
+#
+# @TEST-PORT: BROKER_PORT1
+# @TEST-PORT: WEBSOCKET_PORT
+#
+# @TEST-EXEC: cp $FILES/ws/wstest.py .
+#
+# @TEST-EXEC: zeek -b --parse-only manager.zeek
+# @TEST-EXEC: zeek -b --parse-only worker.zeek
+# @TEST-EXEC: python3 -m py_compile client.py
+#
+# @TEST-EXEC: btest-bg-run manager "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=manager zeek -b ../manager.zeek"
+# @TEST-EXEC: btest-bg-run worker-1 "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=worker-1 zeek -b ../worker.zeek"
+# @TEST-EXEC: btest-bg-run client "python3 ../client.py"
+#
+# @TEST-EXEC: btest-bg-wait 30
+# @TEST-EXEC: btest-diff ./manager/.stdout
+# @TEST-EXEC: TEST_DIFF_CANONIFIER='grep -v "Error reading HTTP request line"' btest-diff ./manager/.stderr
+# @TEST-EXEC: btest-diff ./worker-1/.stdout
+# @TEST-EXEC: TEST_DIFF_CANONIFIER='grep -v PEER_UNAVAILABLE' btest-diff ./worker-1/.stderr
+# @TEST-EXEC: btest-diff ./client/.stdout
+# @TEST-EXEC: btest-diff ./client/.stderr
+
+# @TEST-START-FILE cluster-layout.zeek
+redef Cluster::nodes = {
+	["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
+	["worker-1"] = [$node_type=Cluster::WORKER,   $ip=127.0.0.1, $manager="manager"],
+};
+# @TEST-END-FILE
+
+# @TEST-START-FILE common.zeek
+redef Log::enable_local_logging = T;
+redef Log::default_rotation_interval = 0sec;
+
+global ping: event(msg: string, c: count) &is_used;
+global pong: event(msg: string, c: count) &is_used;
+
+global ping_count = 0;
+
+redef Broker::disable_ssl = T;
+
+event zeek_init()
+	{
+	Cluster::subscribe("/test/pings/");
+	}
+
+event pong(msg: string, n: count) &is_used
+	{
+	print fmt("%s: got pong: %s, %s", current_time(), msg, n);
+	}
+
+event ping(msg: string, n: count) &is_used
+	{
+        ++ping_count;
+	print fmt("%s: got ping: %s, %s", current_time(), msg, n);
+
+	local reply_msg = fmt("%s reply for ping(%s, %s)", Cluster::node, msg, n);
+	if ( (msg == "to-manager" && Cluster::local_node_type() == Cluster::MANAGER) ||
+	     (msg == "to-worker" && Cluster::local_node_type() == Cluster::WORKER) )
+		Cluster::publish("/test/pings/", pong, reply_msg, ping_count);
+	}
+# @TEST-END-FILE
+
+# @TEST-START-FILE manager.zeek
+@load ./common.zeek
+
+event Cluster::node_up(name: string, id: string)
+	{
+	print fmt("%s: Cluster::node_up %s", current_time(), name);
+
+	# Delay listening on WebSocket clients until worker-1 is around.
+	if ( name == "worker-1" )
+		Cluster::listen_websocket([
+			$listen_host="127.0.0.1",
+			$listen_port=to_port(getenv("WEBSOCKET_PORT"))
+		]);
+	}
+
+global added = 0;
+global lost = 0;
+
+event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions: string_vec)
+	{
+	++added;
+	print fmt("%s: Cluster::websocket_client_added %s %s", current_time(), added, subscriptions);
+	}
+
+event Cluster::websocket_client_lost(info: Cluster::EndpointInfo)
+	{
+	++lost;
+	print fmt("%s: Cluster::websocket_client_lost %s", current_time(), lost);
+
+	if ( lost == 3 )
+		{
+		print fmt("%s: terminate()", current_time());
+		terminate();
+		}
+	}
+# @TEST-END-FILE
+
+# @TEST-START-FILE worker.zeek
+@load ./common.zeek
+
+event Cluster::node_up(name: string, id: string)
+	{
+	print fmt("%s: Cluster::node_up %s", current_time(), name);
+	}
+
+event Cluster::node_down(name: string, id: string)
+	{
+	print fmt("%s: Cluster::node_down %s", current_time(), name);
+	terminate();
+	}
+# @TEST-END-FILE
+
+
+# @TEST-START-FILE client.py
+import wstest
+
+def run(ws_url):
+    with (
+        wstest.connect("ws1", ws_url) as tc1,
+        wstest.connect("ws2", ws_url) as tc2,
+        wstest.connect("ws3", ws_url) as tc3,
+    ):
+        clients = [tc1, tc2, tc3]
+        print("Connected!")
+        ids = set()
+        for tc in clients:
+            ack = tc.hello_v1(["/test/pings/"])
+            ids.add(ack["endpoint"])
+
+        print("unique ids", len(ids))
+
+        for i in range(1, 4):
+            msg = "to-manager" if i % 2 == 0 else "to-worker"
+            tc1.send_json(wstest.build_event_v1("/test/pings/", "ping", [msg, 100 + i]))
+            wstest.recv_until_timeout(clients, desc=f"tc1 - ping {i}")
+
+            tc2.send_json(wstest.build_event_v1("/test/pings/", "ping", [msg, 200 + i]))
+            wstest.recv_until_timeout(clients, desc=f"tc2 - ping {i}")
+
+            tc3.send_json(wstest.build_event_v1("/test/pings/", "ping", [msg, 300 + i]))
+            wstest.recv_until_timeout(clients, desc=f"tc3 - ping {i}")
+
+
+if __name__ == "__main__":
+    wstest.main(run, wstest.WS4_URL_V1)
+# @TEST-END-FILE