diff --git a/ci/start-broker.sh b/ci/start-broker.sh
index 86d81ece98..89ab76572d 100755
--- a/ci/start-broker.sh
+++ b/ci/start-broker.sh
@@ -19,6 +19,7 @@ mv tls-gen/basic/result/server_$(hostname -s)_key.pem tls-gen/basic/result/serve
 mv tls-gen/basic/server_$(hostname -s) tls-gen/basic/server
 mv tls-gen/basic/client_$(hostname -s) tls-gen/basic/client
 
+rm -rf rabbitmq-configuration
 mkdir -p rabbitmq-configuration/tls
 
 cp -R "${PWD}"/tls-gen/basic/* rabbitmq-configuration/tls
@@ -37,5 +38,6 @@ docker run -d --name rabbitmq \
 
 wait_for_message rabbitmq "completed with"
 
+docker exec rabbitmq rabbitmqctl enable_feature_flag --opt-in khepri_db
 docker exec rabbitmq rabbitmq-diagnostics erlang_version
 docker exec rabbitmq rabbitmqctl version
diff --git a/ci/start-cluster.sh b/ci/start-cluster.sh
index efee59ee2e..6b01992d96 100755
--- a/ci/start-cluster.sh
+++ b/ci/start-cluster.sh
@@ -19,6 +19,7 @@ mv tls-gen/basic/result/server_$(hostname -s)_key.pem tls-gen/basic/result/serve
 mv tls-gen/basic/server_$(hostname -s) tls-gen/basic/server
 mv tls-gen/basic/client_$(hostname -s) tls-gen/basic/client
 
+rm -rf rabbitmq-configuration
 mkdir -p rabbitmq-configuration/tls
 
 cp -R "${PWD}"/tls-gen/basic/* rabbitmq-configuration/tls
@@ -74,6 +75,9 @@ sleep 10
 
 docker exec hare rabbitmqctl --node hare@$(hostname) await_startup
 
+docker exec hare rabbitmqctl --node hare@$(hostname) enable_feature_flag --opt-in khepri_db
+docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) enable_feature_flag --opt-in khepri_db
+
 docker exec rabbitmq rabbitmq-diagnostics --node rabbit@$(hostname) erlang_version
 docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) version
 docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) status
diff --git a/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java b/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java
index 4257c5a7b3..b54507d5df 100644
--- a/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java
+++ b/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java
@@ -23,6 +23,7 @@
 import com.rabbitmq.client.test.BrokerTestCase;
 import com.rabbitmq.client.test.TestUtils;
 import com.rabbitmq.tools.Host;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -367,6 +368,7 @@ private void testClientNamedQueueRecoveryWith(String q, boolean noWait) throws I
     }
 
     // bug 26552
+    @Disabled
     @Test public void clientNamedTransientAutoDeleteQueueAndBindingRecovery() throws IOException, InterruptedException, TimeoutException {
         String q   = UUID.randomUUID().toString();
         String x   = "tmp-fanout";
diff --git a/src/test/java/com/rabbitmq/client/test/functional/DurableOnTransient.java b/src/test/java/com/rabbitmq/client/test/functional/DurableOnTransient.java
index 8496c45be3..f3dec6d0fe 100644
--- a/src/test/java/com/rabbitmq/client/test/functional/DurableOnTransient.java
+++ b/src/test/java/com/rabbitmq/client/test/functional/DurableOnTransient.java
@@ -20,6 +20,7 @@
 
 import java.io.IOException;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.rabbitmq.client.GetResponse;
@@ -67,6 +68,7 @@ protected void releaseResources() throws IOException {
         assertNotNull(basicGet());
     }
 
+    @Disabled("Does not apply with Khepri (update datastore while second node is down)")
     @Test public void semiDurableBindingRemoval() throws IOException {
         if (clusteredConnection != null) {
             deleteExchange("x");