diff --git a/testing/btest/Baseline/scripts.base.frameworks.storage.redis-cluster/worker-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.storage.redis-cluster/worker-1..stdout
new file mode 100644
index 0000000000..01c6005755
--- /dev/null
+++ b/testing/btest/Baseline/scripts.base.frameworks.storage.redis-cluster/worker-1..stdout
@@ -0,0 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+worker-1, put result, T
+redis_data_written
+worker-1, [val=5678, error=<uninitialized>]
diff --git a/testing/btest/Baseline/scripts.base.frameworks.storage.redis-cluster/worker-2..stdout b/testing/btest/Baseline/scripts.base.frameworks.storage.redis-cluster/worker-2..stdout
new file mode 100644
index 0000000000..76ee9cc9df
--- /dev/null
+++ b/testing/btest/Baseline/scripts.base.frameworks.storage.redis-cluster/worker-2..stdout
@@ -0,0 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+redis_data_written
+worker-2, [val=5678, error=<uninitialized>]
diff --git a/testing/btest/scripts/base/frameworks/storage/redis-cluster.zeek b/testing/btest/scripts/base/frameworks/storage/redis-cluster.zeek
new file mode 100644
index 0000000000..d6e1de7af3
--- /dev/null
+++ b/testing/btest/scripts/base/frameworks/storage/redis-cluster.zeek
@@ -0,0 +1,87 @@
+# @TEST-DOC: Tests Redis storage in a cluster environment
+
+# @TEST-REQUIRES: have-redis
+# @TEST-PORT: REDIS_PORT
+# @TEST-PORT: BROKER_PORT1
+# @TEST-PORT: BROKER_PORT2
+# @TEST-PORT: BROKER_PORT3
+
+# Generate a redis.conf file with the port defined above, but without the /tcp at the end of
+# it. This also sets some paths in the conf to the testing directory.
+# @TEST-EXEC: cat $FILES/redis.conf | sed "s|%REDIS_PORT%|${REDIS_PORT%/tcp}|g" | sed "s|%RUN_PATH%|$(pwd)|g" > ./redis.conf
+# @TEST-EXEC: btest-bg-run redis redis-server ../redis.conf
+
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT
+# @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT
+# @TEST-EXEC: btest-bg-wait -k 5
+# @TEST-EXEC: btest-diff worker-1/.stdout
+# @TEST-EXEC: btest-diff worker-2/.stdout
+# @TEST-EXEC:
+
+@load base/frameworks/storage
+@load base/frameworks/cluster
+@load policy/frameworks/storage/backend/redis
+@load policy/frameworks/cluster/experimental
+
+@TEST-START-FILE cluster-layout.zeek
+redef Cluster::nodes = {
+	["manager-1"] = [$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, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"],
+	["worker-2"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"],
+};
+@TEST-END-FILE
+
+global redis_data_written: event() &is_used;
+
+@if ( Cluster::local_node_type() == Cluster::WORKER )
+
+global backend: opaque of Storage::BackendHandle;
+type str: string;
+
+event zeek_init() {
+	local opts : Storage::Backend::Redis::Options;
+	opts$server_host = "127.0.0.1";
+	opts$server_port = to_port(getenv("REDIS_PORT"));
+	opts$key_prefix = "testing";
+	opts$async_mode = F;
+
+	backend = Storage::open_backend(Storage::REDIS, opts, str, str);
+}
+
+event redis_data_written() {
+	print "redis_data_written";
+	local res = Storage::get(backend, "1234", F);
+	print Cluster::node, res;
+	Storage::close_backend(backend);
+	terminate();
+}
+
+@else
+
+global node_count: count = 0;
+
+event Cluster::node_down(name: string, id: string) {
+	++node_count;
+	if ( node_count == 2 )
+		terminate();
+}
+
+event redis_data_written() {
+	local e = Cluster::make_event(redis_data_written);
+	Cluster::publish(Cluster::worker_topic, e);
+}
+
+@endif
+
+@if ( Cluster::node == "worker-1" )
+
+event Cluster::Experimental::cluster_started() {
+	local res = Storage::put(backend, [$key="1234", $value="5678", $async_mode=F]);
+	print Cluster::node, "put result", res;
+
+	local e = Cluster::make_event(redis_data_written);
+	Cluster::publish(Cluster::manager_topic, e);
+}
+
+@endif