diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensionsTests.kt
index 21f6a1d6a..0eb1b006a 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensionsTests.kt
@@ -94,7 +94,7 @@ class ReactiveFindOperationExtensionsTests {
 		}
 	}
 
-	@Test // DATAMONGO-2209
+	@Test // DATAMONGO-2247
 	fun terminatingFindAwaitOneWithNull() {
 
 		val find = mockk<ReactiveFindOperation.TerminatingFind<String>>()
@@ -109,7 +109,7 @@ class ReactiveFindOperationExtensionsTests {
 		}
 	}
 
-	@Test // DATAMONGO-2209
+	@Test // DATAMONGO-2247
 	fun terminatingFindAwaitOneOrNullWithValue() {
 
 		val find = mockk<ReactiveFindOperation.TerminatingFind<String>>()
@@ -124,7 +124,7 @@ class ReactiveFindOperationExtensionsTests {
 		}
 	}
 
-	@Test // DATAMONGO-2209
+	@Test // DATAMONGO-2247
 	fun terminatingFindAwaitOneOrNullWithNull() {
 
 		val find = mockk<ReactiveFindOperation.TerminatingFind<String>>()
@@ -154,7 +154,7 @@ class ReactiveFindOperationExtensionsTests {
 		}
 	}
 
-	@Test // DATAMONGO-2209
+	@Test // DATAMONGO-2247
 	fun terminatingFindAwaitFirstWithNull() {
 
 		val find = mockk<ReactiveFindOperation.TerminatingFind<String>>()
@@ -169,7 +169,7 @@ class ReactiveFindOperationExtensionsTests {
 		}
 	}
 
-	@Test // DATAMONGO-2209
+	@Test // DATAMONGO-2247
 	fun terminatingFindAwaitFirstOrNullWithValue() {
 
 		val find = mockk<ReactiveFindOperation.TerminatingFind<String>>()
@@ -184,7 +184,7 @@ class ReactiveFindOperationExtensionsTests {
 		}
 	}
 
-	@Test // DATAMONGO-2209
+	@Test // DATAMONGO-2247
 	fun terminatingFindAwaitFirstOrNullWithNull() {
 
 		val find = mockk<ReactiveFindOperation.TerminatingFind<String>>()
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveUpdateOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveUpdateOperationExtensionsTests.kt
index 4dc46c1c2..2628ad944 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveUpdateOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveUpdateOperationExtensionsTests.kt
@@ -65,7 +65,7 @@ class ReactiveUpdateOperationExtensionsTests {
 		}
 	}
 
-	@Test // DATAMONGO-2209
+	@Test // DATAMONGO-2247
 	fun findModifyAndAwaitWithNull() {
 
 		val find = mockk<ReactiveUpdateOperation.TerminatingFindAndModify<String>>()
@@ -80,7 +80,7 @@ class ReactiveUpdateOperationExtensionsTests {
 		}
 	}
 
-	@Test // DATAMONGO-2209
+	@Test // DATAMONGO-2247
 	fun findModifyAndAwaitOrNullWithValue() {
 
 		val find = mockk<ReactiveUpdateOperation.TerminatingFindAndModify<String>>()
@@ -95,7 +95,7 @@ class ReactiveUpdateOperationExtensionsTests {
 		}
 	}
 
-	@Test // DATAMONGO-2209
+	@Test // DATAMONGO-2247
 	fun findModifyAndAwaitOrNullWithNull() {
 
 		val find = mockk<ReactiveUpdateOperation.TerminatingFindAndModify<String>>()
@@ -125,7 +125,7 @@ class ReactiveUpdateOperationExtensionsTests {
 		}
 	}
 
-	@Test // DATAMONGO-2209
+	@Test // DATAMONGO-2247
 	fun findReplaceAndAwaitWithNull() {
 
 		val find = mockk<ReactiveUpdateOperation.TerminatingFindAndReplace<String>>()
@@ -140,7 +140,7 @@ class ReactiveUpdateOperationExtensionsTests {
 		}
 	}
 
-	@Test // DATAMONGO-2209
+	@Test // DATAMONGO-2247
 	fun findReplaceAndAwaitOrNullWithValue() {
 
 		val find = mockk<ReactiveUpdateOperation.TerminatingFindAndReplace<String>>()
@@ -155,7 +155,7 @@ class ReactiveUpdateOperationExtensionsTests {
 		}
 	}
 
-	@Test // DATAMONGO-2209
+	@Test // DATAMONGO-2247
 	fun findReplaceAndAwaitOrNullWithNull() {
 
 		val find = mockk<ReactiveUpdateOperation.TerminatingFindAndReplace<String>>()