diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTests.java
index a5ceca8673..4fe6d74491 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTests.java
@@ -58,7 +58,7 @@ import static org.junit.Assert.assertThat;
 @WebAppConfiguration
 @DirtiesContext
 @IntegrationTest("server.port=0")
-public class BasicErrorControllerIntegrationTest {
+public class BasicErrorControllerIntegrationTests {
 
 	@Value("${local.server.port}")
 	private int port;
diff --git a/spring-boot-samples/spring-boot-sample-data-gemfire/src/test/java/sample/data/gemfire/SampleDataGemFireApplicationTest.java b/spring-boot-samples/spring-boot-sample-data-gemfire/src/test/java/sample/data/gemfire/SampleDataGemFireApplicationTests.java
similarity index 96%
rename from spring-boot-samples/spring-boot-sample-data-gemfire/src/test/java/sample/data/gemfire/SampleDataGemFireApplicationTest.java
rename to spring-boot-samples/spring-boot-sample-data-gemfire/src/test/java/sample/data/gemfire/SampleDataGemFireApplicationTests.java
index 419826ff2d..6c4eb1a7e6 100644
--- a/spring-boot-samples/spring-boot-sample-data-gemfire/src/test/java/sample/data/gemfire/SampleDataGemFireApplicationTest.java
+++ b/spring-boot-samples/spring-boot-sample-data-gemfire/src/test/java/sample/data/gemfire/SampleDataGemFireApplicationTests.java
@@ -36,14 +36,14 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 /**
- * The SampleDataGemFireApplicationTest class is a test suite with test cases testing the
+ * The SampleDataGemFireApplicationTests class is a test suite with test cases testing the
  * SampleDataGemFireApplication in Spring Boot.
  *
  * @author John Blum
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = SampleDataGemFireApplication.class)
-public class SampleDataGemFireApplicationTest {
+public class SampleDataGemFireApplicationTests {
 
 	@Autowired
 	private GemstoneService gemstoneService;
diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/ByteArrayRandomAccessDataTest.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/ByteArrayRandomAccessDataTests.java
similarity index 97%
rename from spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/ByteArrayRandomAccessDataTest.java
rename to spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/ByteArrayRandomAccessDataTests.java
index 7feaa731f4..506dc47a03 100644
--- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/ByteArrayRandomAccessDataTest.java
+++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/ByteArrayRandomAccessDataTests.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertThat;
  *
  * @author Phillip Webb
  */
-public class ByteArrayRandomAccessDataTest {
+public class ByteArrayRandomAccessDataTests {
 
 	@Test
 	public void testGetInputStream() throws Exception {
diff --git a/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTest.java b/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTests.java
similarity index 98%
rename from spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTest.java
rename to spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTests.java
index 73c333a8f6..f50ed2c9f5 100644
--- a/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTest.java
+++ b/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTests.java
@@ -34,7 +34,7 @@ import static org.springframework.boot.ansi.AnsiElement.RED;
  *
  * @author Phillip Webb
  */
-public class AnsiOutputTest {
+public class AnsiOutputTests {
 
 	@BeforeClass
 	public static void enable() {