diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java
index ea1766f05e..264aa0d326 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java
@@ -18,7 +18,6 @@ package org.springframework.boot.autoconfigure.data.mongo;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
-import java.util.Optional;
 import java.util.Set;
 
 import com.mongodb.Mongo;
@@ -166,13 +165,9 @@ public class MongoDataAutoConfigurationTests {
 				MongoDataAutoConfiguration.class);
 		this.context.refresh();
 		MongoMappingContext context = this.context.getBean(MongoMappingContext.class);
-		Optional<BasicMongoPersistentEntity<?>> entity = context
-				.getPersistentEntity(Sample.class);
-		assertThat(entity).isPresent();
-		Optional<MongoPersistentProperty> dateProperty = entity.get()
-				.getPersistentProperty("date");
-		assertThat(dateProperty).isPresent();
-		assertThat(dateProperty.get().isEntity()).isFalse();
+		BasicMongoPersistentEntity<?> entity = context.getPersistentEntity(Sample.class);
+		MongoPersistentProperty dateProperty = entity.getPersistentProperty("date");
+		assertThat(dateProperty.isEntity()).isFalse();
 	}
 
 	public void testFieldNamingStrategy(String strategy,