diff --git a/testing/btest/Baseline/core.leaks.hll_cluster/manager-1..stdout b/testing/btest/Baseline/core.leaks.hll_cluster/manager-1..stdout
new file mode 100644
index 0000000000..910a87642c
--- /dev/null
+++ b/testing/btest/Baseline/core.leaks.hll_cluster/manager-1..stdout
@@ -0,0 +1,2 @@
+This value should be about 21:
+21.003365
diff --git a/testing/btest/Baseline/core.leaks.hll_cluster/worker-1..stdout b/testing/btest/Baseline/core.leaks.hll_cluster/worker-1..stdout
new file mode 100644
index 0000000000..e64c2b30aa
--- /dev/null
+++ b/testing/btest/Baseline/core.leaks.hll_cluster/worker-1..stdout
@@ -0,0 +1,2 @@
+This value should be around 13:
+13.00129
diff --git a/testing/btest/Baseline/core.leaks.hll_cluster/worker-2..stdout b/testing/btest/Baseline/core.leaks.hll_cluster/worker-2..stdout
new file mode 100644
index 0000000000..d2b4f08b8d
--- /dev/null
+++ b/testing/btest/Baseline/core.leaks.hll_cluster/worker-2..stdout
@@ -0,0 +1,2 @@
+This value should be about 12:
+12.001099
diff --git a/testing/btest/core/leaks/hll_cluster.bro b/testing/btest/core/leaks/hll_cluster.bro
new file mode 100644
index 0000000000..01653a895f
--- /dev/null
+++ b/testing/btest/core/leaks/hll_cluster.bro
@@ -0,0 +1,111 @@
+# Needs perftools support.
+#
+# @TEST-SERIALIZE: comm
+# @TEST-GROUP: leaks
+#
+# @TEST-REQUIRES: bro  --help 2>&1 | grep -q mem-leaks
+#
+# @TEST-EXEC: bro %INPUT>out
+# @TEST-EXEC: btest-bg-run manager-1 HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 bro %INPUT
+# @TEST-EXEC: sleep 2
+# @TEST-EXEC: btest-bg-run worker-1 HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 bro runnumber=1 %INPUT
+# @TEST-EXEC: btest-bg-run worker-2 HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 bro runnumber=2 %INPUT
+# @TEST-EXEC: btest-bg-wait -k 10
+# 
+# @TEST-EXEC: btest-diff manager-1/.stdout
+# @TEST-EXEC: btest-diff worker-1/.stdout
+# @TEST-EXEC: btest-diff worker-2/.stdout
+
+@TEST-START-FILE cluster-layout.bro
+redef Cluster::nodes = {
+	["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=37757/tcp, $workers=set("worker-1", "worker-2")],
+	["worker-1"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=37760/tcp, $manager="manager-1"],
+	["worker-2"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=37761/tcp, $manager="manager-1"],
+};
+@TEST-END-FILE
+
+redef Log::default_rotation_interval = 0secs;
+
+global hll_data: event(data: opaque of cardinality);
+
+redef Cluster::worker2manager_events += /hll_data/;
+
+@if ( Cluster::local_node_type() == Cluster::WORKER )
+
+global runnumber: count &redef; # differentiate runs
+
+event remote_connection_handshake_done(p: event_peer)
+	{
+	local c = hll_cardinality_init(0.01);
+
+	local add1 = 2001;
+	local add2 = 2002;
+	local add3 = 2003;
+
+	if ( runnumber == 1 )
+		{
+		hll_cardinality_add(c, add1);
+		hll_cardinality_add(c, add2);
+		hll_cardinality_add(c, add3);
+		hll_cardinality_add(c, 1000);
+		hll_cardinality_add(c, 1001);
+		hll_cardinality_add(c, 101);
+		hll_cardinality_add(c, 1003);
+		hll_cardinality_add(c, 1004);
+		hll_cardinality_add(c, 1005);
+		hll_cardinality_add(c, 1006);
+		hll_cardinality_add(c, 1007);
+		hll_cardinality_add(c, 1008);
+		hll_cardinality_add(c, 1009);
+		print "This value should be around 13:";
+		print hll_cardinality_estimate(c);
+		} 
+	else if ( runnumber == 2 ) 
+		{
+		hll_cardinality_add(c, add1);
+		hll_cardinality_add(c, add2);
+		hll_cardinality_add(c, add3);
+		hll_cardinality_add(c, 1);
+		hll_cardinality_add(c, 101);
+		hll_cardinality_add(c, 2);
+		hll_cardinality_add(c, 3);
+		hll_cardinality_add(c, 4);
+		hll_cardinality_add(c, 5);
+		hll_cardinality_add(c, 6);
+		hll_cardinality_add(c, 7);
+		hll_cardinality_add(c, 8);
+		print "This value should be about 12:";
+		print hll_cardinality_estimate(c);
+		}
+	
+	event hll_data(c);
+
+	terminate();
+	}
+
+@endif
+
+@if ( Cluster::local_node_type() == Cluster::MANAGER )
+
+global result_count = 0;
+global hll: opaque of cardinality;
+
+event bro_init() 
+	{
+	hll = hll_cardinality_init(0.01);
+	}
+
+event hll_data(data: opaque of cardinality)
+	{
+	hll_cardinality_merge_into(hll, data);
+	++result_count;
+
+	if ( result_count == 2 )
+		{
+		print "This value should be about 21:";
+		print hll_cardinality_estimate(hll);		
+		terminate();
+		}
+	}
+
+@endif