diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WelcomePageMockMvcTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WelcomePageMockMvcTests.java
index 8b72242a5c..663ab276d1 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WelcomePageMockMvcTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WelcomePageMockMvcTests.java
@@ -16,6 +16,9 @@
 
 package org.springframework.boot.autoconfigure.web;
 
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -27,6 +30,8 @@ import org.junit.Test;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.context.embedded.MockEmbeddedServletContainerFactory;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -34,9 +39,6 @@ import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.ConfigurableWebApplicationContext;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 /**
  * Tests for welcome page using {@link MockMvc} and {@link SpringJUnit4ClassRunner}.
  *
@@ -67,7 +69,7 @@ public class WelcomePageMockMvcTests {
 	public void homePageCustomLocation() throws Exception {
 		this.wac = (ConfigurableWebApplicationContext) new SpringApplicationBuilder(
 				TestConfiguration.class).properties(
-				"spring.resources.staticLocations:classpath:/custom/").run();
+						"spring.resources.staticLocations:classpath:/custom/").run();
 		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
 		this.mockMvc.perform(get("/")).andExpect(status().isOk()).andReturn();
 	}
@@ -76,7 +78,7 @@ public class WelcomePageMockMvcTests {
 	public void homePageCustomLocationNoTrailingSlash() throws Exception {
 		this.wac = (ConfigurableWebApplicationContext) new SpringApplicationBuilder(
 				TestConfiguration.class).properties(
-				"spring.resources.staticLocations:classpath:/custom").run();
+						"spring.resources.staticLocations:classpath:/custom").run();
 		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
 		this.mockMvc.perform(get("/")).andExpect(status().isOk()).andReturn();
 	}
@@ -84,12 +86,10 @@ public class WelcomePageMockMvcTests {
 	@Target(ElementType.TYPE)
 	@Retention(RetentionPolicy.RUNTIME)
 	@Documented
-	@Import({ EmbeddedServletContainerAutoConfiguration.EmbeddedTomcat.class,
-			EmbeddedServletContainerAutoConfiguration.class,
-			ServerPropertiesAutoConfiguration.class,
-			DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class,
-			HttpMessageConvertersAutoConfiguration.class,
-			ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class })
+	@Import({ ServerPropertiesAutoConfiguration.class,
+		DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class,
+		HttpMessageConvertersAutoConfiguration.class,
+		ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class })
 	protected static @interface MinimalWebConfiguration {
 	}
 
@@ -97,6 +97,11 @@ public class WelcomePageMockMvcTests {
 	@MinimalWebConfiguration
 	public static class TestConfiguration {
 
+		@Bean
+		public MockEmbeddedServletContainerFactory embeddedServletContainerFactory() {
+			return new MockEmbeddedServletContainerFactory();
+		}
+
 		// For manual testing
 		public static void main(String[] args) {
 			SpringApplication.run(TestConfiguration.class, args);