diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMapping.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMapping.java
index fb71c09b55..1d1e84197b 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMapping.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMapping.java
@@ -107,6 +107,7 @@ public class EndpointHandlerMapping extends RequestMappingHandlerMapping impleme
 	}
 
 	@Override
+	@Deprecated
 	protected void registerHandlerMethod(Object handler, Method method,
 			RequestMappingInfo mapping) {
 		if (mapping == null) {
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java
index 2ae788f2b0..af07a1de72 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java
@@ -205,4 +205,5 @@ public class HealthMvcEndpointTests {
 		Health health = ((ResponseEntity<Health>) result).getBody();
 		assertTrue(health.getStatus() == Status.DOWN);
 	}
+
 }
diff --git a/spring-boot/src/main/java/org/springframework/boot/test/IntegrationTestPropertiesListener.java b/spring-boot/src/main/java/org/springframework/boot/test/IntegrationTestPropertiesListener.java
index e067a3100e..203509165f 100644
--- a/spring-boot/src/main/java/org/springframework/boot/test/IntegrationTestPropertiesListener.java
+++ b/spring-boot/src/main/java/org/springframework/boot/test/IntegrationTestPropertiesListener.java
@@ -37,7 +37,7 @@ public class IntegrationTestPropertiesListener extends AbstractTestExecutionList
 	public void prepareTestInstance(TestContext testContext) throws Exception {
 		Class<?> testClass = testContext.getTestClass();
 		AnnotationAttributes annotationAttributes = AnnotatedElementUtils
-				.getAnnotationAttributes(testClass, IntegrationTest.class.getName());
+				.getMergedAnnotationAttributes(testClass, IntegrationTest.class.getName());
 		if (annotationAttributes != null) {
 			addPropertySourceProperties(testContext,
 					annotationAttributes.getStringArray("value"));
diff --git a/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTests.java b/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTests.java
index f50ed2c9f5..63a92dd46c 100644
--- a/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTests.java
@@ -23,11 +23,6 @@ import org.springframework.boot.ansi.AnsiOutput.Enabled;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
-import static org.springframework.boot.ansi.AnsiElement.BOLD;
-import static org.springframework.boot.ansi.AnsiElement.FAINT;
-import static org.springframework.boot.ansi.AnsiElement.GREEN;
-import static org.springframework.boot.ansi.AnsiElement.NORMAL;
-import static org.springframework.boot.ansi.AnsiElement.RED;
 
 /**
  * Tests for {@link AnsiOutput}.
@@ -48,8 +43,8 @@ public class AnsiOutputTests {
 
 	@Test
 	public void encoding() throws Exception {
-		String encoded = AnsiOutput.toString("A", RED, BOLD, "B", NORMAL, "D", GREEN,
-				"E", FAINT, "F");
+		String encoded = AnsiOutput.toString("A", AnsiColor.RED, AnsiStyle.BOLD, "B",
+				AnsiStyle.NORMAL, "D", AnsiColor.GREEN, "E", AnsiStyle.FAINT, "F");
 		assertThat(encoded, equalTo("ABDEF"));
 	}
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
index 49c508958c..30a3be1bee 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
@@ -37,9 +37,9 @@ import javax.servlet.ServletResponse;
 
 import org.apache.http.client.HttpClient;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLContextBuilder;
 import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
 import org.apache.http.impl.client.HttpClients;
+import org.apache.http.ssl.SSLContextBuilder;
 import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;