diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperNoConfigClientTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperNoConfigClientTests.java
index 14a08789..e0b65450 100644
--- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperNoConfigClientTests.java
+++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperNoConfigClientTests.java
@@ -31,8 +31,10 @@ public class ConsulConfigServerBootstrapperNoConfigClientTests {
 
 	@Test
 	public void enabledAddsInstanceProviderFn() {
-		new SpringApplicationBuilder(TestConfig.class).properties("spring.cloud.config.discovery.enabled=true",
-				"spring.cloud.service-registry.auto-registration.enabled=false").run().close();
+		new SpringApplicationBuilder(TestConfig.class)
+				.properties("--server.port=0", "spring.cloud.config.discovery.enabled=true",
+						"spring.cloud.service-registry.auto-registration.enabled=false")
+				.run().close();
 	}
 
 	@SpringBootConfiguration
diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperTests.java
index 6efe6655..946e7ffc 100644
--- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperTests.java
+++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperTests.java
@@ -30,7 +30,7 @@ public class ConsulConfigServerBootstrapperTests {
 	@Test
 	public void notEnabledDoesNotAddInstanceProviderFn() {
 		new SpringApplicationBuilder(TestConfig.class)
-				.properties("spring.cloud.service-registry.auto-registration.enabled=false")
+				.properties("--server.port=0", "spring.cloud.service-registry.auto-registration.enabled=false")
 				.addBootstrapper(registry -> registry.addCloseListener(event -> {
 					ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext()
 							.get(ConfigServerInstanceProvider.Function.class);
@@ -42,7 +42,7 @@ public class ConsulConfigServerBootstrapperTests {
 	@Test
 	public void enabledAddsInstanceProviderFn() {
 		new SpringApplicationBuilder(TestConfig.class)
-				.properties("spring.cloud.config.discovery.enabled=true",
+				.properties("--server.port=0", "spring.cloud.config.discovery.enabled=true",
 						"spring.cloud.service-registry.auto-registration.enabled=false")
 				.addBootstrapper(registry -> registry.addCloseListener(event -> {
 					ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext()