diff --git a/CHANGES b/CHANGES
index 5c2e45dfb7..c6fb99be15 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+7.2.0-dev.499 | 2025-04-09 18:11:08 +0200
+
+  * btest/brokerstore-attr-persistence-clone: Add BTEST_BG_RUN_SLEEP=1 (Arne Welzel, Corelight)
+
 7.2.0-dev.497 | 2025-04-08 11:30:53 -0700
 
   * Add move assignment operator to ZeekString, which already had a move constructor (Tim Wojtulewicz, Corelight)
diff --git a/VERSION b/VERSION
index e09484b239..817d7c5110 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.2.0-dev.497
+7.2.0-dev.499
diff --git a/testing/btest/broker/store/brokerstore-attr-persistence-clone.zeek b/testing/btest/broker/store/brokerstore-attr-persistence-clone.zeek
index d279b100ee..8903c5b89a 100644
--- a/testing/btest/broker/store/brokerstore-attr-persistence-clone.zeek
+++ b/testing/btest/broker/store/brokerstore-attr-persistence-clone.zeek
@@ -1,8 +1,12 @@
 # @TEST-PORT: BROKER_PORT
 
 # @TEST-EXEC: zeek -b %DIR/sort-stuff.zeek common.zeek one.zeek > output1
-# @TEST-EXEC: btest-bg-run master "cp ../*.sqlite . && zeek -b %DIR/sort-stuff.zeek ../common.zeek ../two.zeek >../output2"
-# @TEST-EXEC: btest-bg-run clone "zeek -b %DIR/sort-stuff.zeek ../common.zeek ../three.zeek >../output3"
+#
+# This test becomes flaky when not sleeping for a second after starting the
+# test. Due to that, we set BTEST_BG_RUN_SLEEP=1 explicitly. See #4312 and
+# #4295 for background.
+# @TEST-EXEC: BTEST_BG_RUN_SLEEP=1 btest-bg-run master "cp ../*.sqlite . && zeek -b %DIR/sort-stuff.zeek ../common.zeek ../two.zeek >../output2"
+# @TEST-EXEC: BTEST_BG_RUN_SLEEP=1 btest-bg-run clone "zeek -b %DIR/sort-stuff.zeek ../common.zeek ../three.zeek >../output3"
 # @TEST-EXEC: btest-bg-wait 20
 
 # @TEST-EXEC: btest-diff output1