diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/AbstractRepositoryConfigurationSourceSupport.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/AbstractRepositoryConfigurationSourceSupport.java
index 57b46b50285..cf7b562c549 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/AbstractRepositoryConfigurationSourceSupport.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/AbstractRepositoryConfigurationSourceSupport.java
@@ -55,8 +55,9 @@ public abstract class AbstractRepositoryConfigurationSourceSupport implements
 	@Override
 	public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata,
 			BeanDefinitionRegistry registry) {
-		new RepositoryConfigurationDelegate(getConfigurationSource(), this.resourceLoader)
-				.registerRepositoriesIn(registry, getRepositoryConfigurationExtension());
+		new RepositoryConfigurationDelegate(getConfigurationSource(),
+				this.resourceLoader, this.environment).registerRepositoriesIn(registry,
+				getRepositoryConfigurationExtension());
 	}
 
 	private AnnotationRepositoryConfigurationSource getConfigurationSource() {
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java
index bd3b3165ec7..4096189741a 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java
@@ -22,7 +22,6 @@ import java.util.List;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
-import com.mongodb.DBPort;
 import com.mongodb.MongoClient;
 import com.mongodb.MongoClientOptions;
 import com.mongodb.MongoClientOptions.Builder;
@@ -42,7 +41,7 @@ public class MongoProperties {
 
 	private String host;
 
-	private int port = DBPort.PORT;
+	private int port = 27017;
 
 	private String uri = "mongodb://localhost/test";
 
@@ -153,14 +152,12 @@ public class MongoProperties {
 		Builder builder = MongoClientOptions.builder();
 		if (options != null) {
 			builder.alwaysUseMBeans(options.isAlwaysUseMBeans());
-			builder.autoConnectRetry(options.isAutoConnectRetry());
 			builder.connectionsPerHost(options.getConnectionsPerHost());
 			builder.connectTimeout(options.getConnectTimeout());
 			builder.cursorFinalizerEnabled(options.isCursorFinalizerEnabled());
 			builder.dbDecoderFactory(options.getDbDecoderFactory());
 			builder.dbEncoderFactory(options.getDbEncoderFactory());
 			builder.description(options.getDescription());
-			builder.maxAutoConnectRetryTime(options.getMaxAutoConnectRetryTime());
 			builder.maxWaitTime(options.getMaxWaitTime());
 			builder.readPreference(options.getReadPreference());
 			builder.socketFactory(options.getSocketFactory());
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java
index 9adf7adbd23..b0ebc4df43f 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java
@@ -52,6 +52,7 @@ public class MongoAutoConfigurationTests {
 		assertEquals(1, this.context.getBeanNamesForType(Mongo.class).length);
 	}
 
+	@SuppressWarnings("deprecation")
 	@Test
 	public void optionsAdded() {
 		this.context = new AnnotationConfigApplicationContext();
@@ -64,6 +65,7 @@ public class MongoAutoConfigurationTests {
 				.getSocketTimeout());
 	}
 
+	@SuppressWarnings("deprecation")
 	@Test
 	public void optionsAddedButNoHost() {
 		this.context = new AnnotationConfigApplicationContext();