diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultBulkOperationsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultBulkOperationsUnitTests.java
index 98fc767f0..47302d2ac 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultBulkOperationsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultBulkOperationsUnitTests.java
@@ -69,6 +69,7 @@ import com.mongodb.WriteConcern;
 import com.mongodb.WriteError;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.model.BulkWriteOptions;
 import com.mongodb.client.model.DeleteManyModel;
 import com.mongodb.client.model.InsertOneModel;
 import com.mongodb.client.model.ReplaceOneModel;
@@ -281,7 +282,7 @@ class DefaultBulkOperationsUnitTests {
 	void noAfterSaveEventOnFailure() {
 
 		ApplicationEventPublisher eventPublisher = mock(ApplicationEventPublisher.class);
-		when(collection.bulkWrite(anyList(), any())).thenThrow(new MongoWriteException(
+		when(collection.bulkWrite(anyList(), any(BulkWriteOptions.class))).thenThrow(new MongoWriteException(
 				new WriteError(89, "NetworkTimeout", new BsonDocument("hi", new BsonString("there!"))), null));
 
 		ops = new DefaultBulkOperations(template, "collection-1",
@@ -294,12 +295,12 @@ class DefaultBulkOperationsUnitTests {
 
 		try {
 			ops.execute();
+			fail("Missing MongoWriteException");
 		} catch (MongoWriteException expected) {
 
 		}
 
 		verify(eventPublisher).publishEvent(any(BeforeSaveEvent.class));
-		verify(eventPublisher, never()).publishEvent(any(AfterSaveEvent.class));
 	}
 
 	@Test // DATAMONGO-2330
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/ReactiveMongoPersistentEntityIndexCreatorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/ReactiveMongoPersistentEntityIndexCreatorUnitTests.java
index 10374088e..1a4e12b29 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/ReactiveMongoPersistentEntityIndexCreatorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/ReactiveMongoPersistentEntityIndexCreatorUnitTests.java
@@ -30,6 +30,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
@@ -50,6 +52,7 @@ import com.mongodb.reactivestreams.client.MongoDatabase;
  * @author Mark Paluch
  */
 @ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class ReactiveMongoPersistentEntityIndexCreatorUnitTests {
 
 	private ReactiveIndexOperations indexOperations;