diff --git a/CHANGES b/CHANGES
index 45f608d47a..ae4764123a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,15 @@
+6.0.0-dev.373 | 2023-04-18 11:11:44 -0700
+
+  * log-caching-cluster: Wait for X509::known_log_certs to populate (Arne Welzel, Corelight)
+
+    The known_log_certs table is populated asynchronously via broker after a
+    Broker::peer_added. It may take a variable amount of time depending on where
+    we run this test and it has been observed flaky specifically for the
+    arm_debian11 task. Instead of racing, give worker-2 3 seconds for receiving
+    the expected table content before continuing.
+
+    Fixes #2885
+
 6.0.0-dev.371 | 2023-04-14 13:02:35 +0200
 
   * ci/debian-11: Install libnode-dev, too (Arne Welzel, Corelight)
diff --git a/VERSION b/VERSION
index d0500a3128..f167bcc8bf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.0-dev.371
+6.0.0-dev.373
diff --git a/testing/btest/scripts/base/files/x509/log-caching-cluster.test b/testing/btest/scripts/base/files/x509/log-caching-cluster.test
index 98c4033204..f7a0373f24 100644
--- a/testing/btest/scripts/base/files/x509/log-caching-cluster.test
+++ b/testing/btest/scripts/base/files/x509/log-caching-cluster.test
@@ -41,7 +41,20 @@ event zeek_init()
 
 event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
 	{
-	continue_processing();
+	if ( /worker-2/ in Cluster::node )
+	       {
+	       when ( |X509::known_log_certs| >= 3 )
+			{
+			continue_processing();
+			}
+		timeout 3sec
+			{
+			Reporter::error("Timeout waiting for X509::known_log_certs to be populated!");
+			terminate();
+			}
+	       }
+	else
+	       continue_processing();
 	}
 @endif