diff --git a/server/src/test/java/org/elasticsearch/gateway/GatewayMetaStatePersistedStateTests.java b/server/src/test/java/org/elasticsearch/gateway/GatewayMetaStatePersistedStateTests.java
index dc53c12f3bcda..31242ff3084aa 100644
--- a/server/src/test/java/org/elasticsearch/gateway/GatewayMetaStatePersistedStateTests.java
+++ b/server/src/test/java/org/elasticsearch/gateway/GatewayMetaStatePersistedStateTests.java
@@ -39,6 +39,7 @@
 import org.elasticsearch.env.TestEnvironment;
 import org.elasticsearch.node.Node;
 import org.elasticsearch.test.ESTestCase;
+import org.elasticsearch.test.junit.annotations.TestIssueLogging;
 import org.elasticsearch.threadpool.TestThreadPool;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
@@ -378,6 +379,7 @@ public void testStatePersistedOnLoad() throws IOException {
         }
     }
 
+    @TestIssueLogging(value = "org.elasticsearch.gateway:TRACE", issueUrl = "https://github.com/elastic/elasticsearch/issues/87952")
     public void testDataOnlyNodePersistence() throws Exception {
         final List<Closeable> cleanup = new ArrayList<>(2);
 
@@ -434,7 +436,7 @@ public void testDataOnlyNodePersistence() throws Exception {
             );
             persistedState.setCurrentTerm(state.term());
             persistedState.setLastAcceptedState(state);
-            assertBusy(() -> assertTrue(gateway.allPendingAsyncStatesWritten()));
+            assertBusy(() -> assertTrue(gateway.allPendingAsyncStatesWritten()), 30, TimeUnit.SECONDS);
 
             assertThat(
                 persistedState.getLastAcceptedState().getLastAcceptedConfiguration(),
@@ -452,7 +454,7 @@ public void testDataOnlyNodePersistence() throws Exception {
             );
 
             persistedState.markLastAcceptedStateAsCommitted();
-            assertBusy(() -> assertTrue(gateway.allPendingAsyncStatesWritten()));
+            assertBusy(() -> assertTrue(gateway.allPendingAsyncStatesWritten()), 30, TimeUnit.SECONDS);
 
             CoordinationMetadata expectedCoordinationMetadata = CoordinationMetadata.builder(coordinationMetadata)
                 .lastCommittedConfiguration(coordinationMetadata.getLastAcceptedConfiguration())
@@ -506,7 +508,7 @@ public void testDataOnlyNodePersistence() throws Exception {
             assertTrue(wroteState); // must write it at least once
             assertEquals(currentTerm, persistedState.getCurrentTerm());
             assertClusterStateEqual(state, persistedState.getLastAcceptedState());
-            assertBusy(() -> assertTrue(gateway.allPendingAsyncStatesWritten()));
+            assertBusy(() -> assertTrue(gateway.allPendingAsyncStatesWritten()), 30, TimeUnit.SECONDS);
 
             gateway.close();
             assertTrue(cleanup.remove(gateway));