diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerTest.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerTest.java
index c061fac3..c8924515 100644
--- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerTest.java
+++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerTest.java
@@ -6,10 +6,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.consul.ConsulAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -19,8 +17,7 @@ import com.ecwid.consul.v1.Response;
 import com.ecwid.consul.v1.health.model.Check;
 
 import static com.ecwid.consul.v1.health.model.Check.CheckStatus.PASSING;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
 /**
@@ -31,7 +28,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 	properties = { "spring.application.name=ttlScheduler",
 		"spring.cloud.consul.discovery.instance-id=ttlScheduler-id",
 		"spring.cloud.consul.discovery.heartbeat.enabled=true",
-		"spring.cloud.consul.discovery.heartbeat.ttlValue=2", "management.port=0" },
+		"spring.cloud.consul.discovery.heartbeat.ttlValue=2", "management.server.port=0" },
 		webEnvironment = RANDOM_PORT)
 public class TtlSchedulerTest {
 
@@ -44,11 +41,13 @@ public class TtlSchedulerTest {
 		Thread.sleep(2100); // Wait for TTL to expired (TTL is set to 2 seconds)
 
 		Check serviceCheck = getCheckForService("ttlScheduler");
-		assertThat("Service check is in wrong state", serviceCheck.getStatus(),
-				equalTo(PASSING));
+		assertThat(serviceCheck).isNotNull();
+		assertThat(serviceCheck.getStatus()).isEqualTo(PASSING)
+				.as("Service check is in wrong state");
 		Check serviceManagementCheck = getCheckForService("ttlScheduler-management");
-		assertThat("Service management heck in wrong state",
-				serviceManagementCheck.getStatus(), equalTo(PASSING));
+		assertThat(serviceManagementCheck).isNotNull();
+		assertThat(serviceManagementCheck.getStatus()).isEqualTo(PASSING)
+				.as("Service management check is in wrong state");
 	}
 
 	private Check getCheckForService(String serviceId) {
@@ -63,7 +62,6 @@ public class TtlSchedulerTest {
 	@Configuration
 	@EnableDiscoveryClient
 	@EnableAutoConfiguration
-	@ImportAutoConfiguration({ ConsulAutoConfiguration.class, ConsulDiscoveryClientConfiguration.class })
 	public static class TtlSchedulerTestConfig { }
 }
 
diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedManagementServicePortTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedManagementServicePortTests.java
index 5afac30a..9942a11d 100644
--- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedManagementServicePortTests.java
+++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedManagementServicePortTests.java
@@ -50,7 +50,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 	properties = {"spring.application.name=myTestService-GG",
 		"spring.cloud.consul.discovery.instanceId=myTestService1-GG",
 		"spring.cloud.consul.discovery.registerHealthCheck=false",
-		"spring.cloud.consul.discovery.managementPort=4452", "management.port=0"},
+		"spring.cloud.consul.discovery.managementPort=4452", "management.server.port=0"},
 		webEnvironment = RANDOM_PORT)
 public class ConsulAutoServiceRegistrationCustomizedManagementServicePortTests {
 
diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementServiceTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementServiceTests.java
index 1115e699..d355b596 100644
--- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementServiceTests.java
+++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementServiceTests.java
@@ -48,7 +48,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 		{"spring.application.name=myTestService-EE",
 				"spring.cloud.consul.discovery.instanceId=myTestService1-EE",
 				"spring.cloud.consul.discovery.registerHealthCheck=false",
-				"management.port=0"},
+				"management.server.port=0"},
 		webEnvironment = RANDOM_PORT)
 public class ConsulAutoServiceRegistrationManagementServiceTests {