diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml
index 2047d88ad3f..221d4d99296 100644
--- a/spring-boot-samples/pom.xml
+++ b/spring-boot-samples/pom.xml
@@ -185,6 +185,25 @@
 					<configuration>
 						<lifecycleMappingMetadata>
 							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.apache.maven.plugins
+										</groupId>
+										<artifactId>
+											maven-enforcer-plugin
+										</artifactId>
+										<versionRange>
+											[1.3.1,)
+										</versionRange>
+										<goals>
+											<goal>enforce</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore />
+									</action>
+								</pluginExecution>
 								<pluginExecution>
 									<pluginExecutionFilter>
 										<groupId>
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationJmxTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationJmxTests.java
index 08892ff3a3a..b91487bc2d8 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationJmxTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationJmxTests.java
@@ -39,6 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @SpringApplicationConfiguration(Config.class)
 @IntegrationTest
 @Deprecated
+@SuppressWarnings("deprecation")
 public class SpringApplicationConfigurationJmxTests {
 
 	@Value("${spring.jmx.enabled}")
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationMixedConfigurationTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationMixedConfigurationTests.java
index e3ef4766f4a..2c6bca16666 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationMixedConfigurationTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationMixedConfigurationTests.java
@@ -36,6 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @DirtiesContext
 @SpringApplicationConfiguration(classes = Config.class, locations = "classpath:test.groovy")
 @Deprecated
+@SuppressWarnings("deprecation")
 public class SpringApplicationConfigurationMixedConfigurationTests {
 
 	@Autowired
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationIntegrationTestPropertyLocationTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationIntegrationTestPropertyLocationTests.java
index f71aed84404..ff4f0400668 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationIntegrationTestPropertyLocationTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationIntegrationTestPropertyLocationTests.java
@@ -46,6 +46,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @IntegrationTest({ "server.port=0", "value1=123" })
 @TestPropertySource(properties = "value2=456", locations = "classpath:/test-property-source-annotation.properties")
 @Deprecated
+@SuppressWarnings("deprecation")
 public class SpringApplicationIntegrationTestPropertyLocationTests {
 
 	@Autowired
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationMockMvcTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationMockMvcTests.java
index 53c6e50992a..06be531aea7 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationMockMvcTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationMockMvcTests.java
@@ -51,6 +51,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @SpringApplicationConfiguration(classes = Config.class)
 @WebAppConfiguration
 @Deprecated
+@SuppressWarnings("deprecation")
 public class SpringApplicationMockMvcTests {
 
 	@Autowired
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationMockServletTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationMockServletTests.java
index b9ff2782bf6..ddc6cb6b1eb 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationMockServletTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/SpringApplicationMockServletTests.java
@@ -43,6 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @ContextConfiguration(classes = Config.class, loader = SpringApplicationContextLoader.class)
 @WebAppConfiguration
 @Deprecated
+@SuppressWarnings("deprecation")
 public class SpringApplicationMockServletTests {
 
 	@Autowired