Merge branch '1.1.x'

spring-boot-samples/spring-boot-sample-data-gemfire/src/test/java/sample/data/gemfire/SampleDataGemFireApplicationTest.java → 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;

spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/ByteArrayRandomAccessDataTest.java → 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 {

spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTest.java → 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() {