diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateIndexTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateIndexTests.java
index 636dd05b1..a9865e2ec 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateIndexTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateIndexTests.java
@@ -82,8 +82,7 @@ public class ReactiveMongoTemplateIndexTests {
 	@AfterEach
 	void cleanUp() {}
 
-	@Test // DATAMONGO-1444
-	@RepeatFailedTest(3)
+	@RepeatFailedTest(3) // DATAMONGO-1444
 	void testEnsureIndexShouldCreateIndex() {
 
 		Person p1 = new Person("Oliver");
@@ -119,8 +118,7 @@ public class ReactiveMongoTemplateIndexTests {
 				}).verifyComplete();
 	}
 
-	@Test // DATAMONGO-1444
-	@RepeatFailedTest(3)
+	@RepeatFailedTest(3) // DATAMONGO-1444
 	void getIndexInfoShouldReturnCorrectIndex() {
 
 		Person p1 = new Person("Oliver");
@@ -150,8 +148,7 @@ public class ReactiveMongoTemplateIndexTests {
 				}).verifyComplete();
 	}
 
-	@Test // DATAMONGO-1444, DATAMONGO-2264
-	@RepeatFailedTest(3)
+	@RepeatFailedTest(3) // DATAMONGO-1444, DATAMONGO-2264
 	void testReadIndexInfoForIndicesCreatedViaMongoShellCommands() {
 
 		template.indexOps(Person.class).dropAllIndexes() //
@@ -201,8 +198,7 @@ public class ReactiveMongoTemplateIndexTests {
 				}).verifyComplete();
 	}
 
-	@Test // DATAMONGO-1928
-	@RepeatFailedTest(3)
+	@RepeatFailedTest(3) // DATAMONGO-1928
 	void shouldCreateIndexOnAccess() {
 
 		template.getCollection("indexedSample").flatMapMany(it -> it.listIndexes(Document.class)) //
@@ -222,8 +218,7 @@ public class ReactiveMongoTemplateIndexTests {
 				.verifyComplete();
 	}
 
-	@Test // DATAMONGO-1928, DATAMONGO-2264
-	@RepeatFailedTest(3)
+	@RepeatFailedTest(3) // DATAMONGO-1928, DATAMONGO-2264
 	void indexCreationShouldFail() throws InterruptedException {
 
 		factory.getMongoDatabase() //
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTests.java
index 275f25895..435c89ca6 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTests.java
@@ -197,8 +197,7 @@ class ChangeStreamTests {
 		assertThat(messageBodies).hasSize(2).doesNotContain(sugarSplashy);
 	}
 
-	@Test // DATAMONGO-1803
-	@RepeatFailedTest(3)
+	@RepeatFailedTest(3) // DATAMONGO-1803
 	void mapsTypedAggregationToFilterMessages() throws InterruptedException {
 
 		CollectingMessageListener<ChangeStreamDocument<Document>, User> messageListener = new CollectingMessageListener<>();