diff --git a/spring-boot-samples/spring-boot-sample-servlet/pom.xml b/spring-boot-samples/spring-boot-sample-servlet/pom.xml
index e1aa379fa3..71abad4237 100644
--- a/spring-boot-samples/spring-boot-sample-servlet/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-servlet/pom.xml
@@ -12,6 +12,7 @@
 	<packaging>war</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
+		<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/spring-boot-samples/spring-boot-sample-servlet/src/main/java/sample/servlet/SampleServletApplication.java b/spring-boot-samples/spring-boot-sample-servlet/src/main/java/sample/servlet/SampleServletApplication.java
index c02d08f168..5eb5b0a5a9 100644
--- a/spring-boot-samples/spring-boot-sample-servlet/src/main/java/sample/servlet/SampleServletApplication.java
+++ b/spring-boot-samples/spring-boot-sample-servlet/src/main/java/sample/servlet/SampleServletApplication.java
@@ -26,12 +26,14 @@ import javax.servlet.ServletResponse;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 @EnableAutoConfiguration
-public class SampleServletApplication {
+public class SampleServletApplication extends SpringBootServletInitializer {
 
 	@SuppressWarnings("serial")
 	@Bean
@@ -49,5 +51,10 @@ public class SampleServletApplication {
 	public static void main(String[] args) throws Exception {
 		SpringApplication.run(SampleServletApplication.class, args);
 	}
+	
+	@Override
+	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+		return application.sources(SampleServletApplication.class);
+	}
 
 }
diff --git a/spring-boot-samples/spring-boot-sample-traditional/src/main/java/sample/traditional/config/WebConfig.java b/spring-boot-samples/spring-boot-sample-traditional/src/main/java/sample/traditional/config/WebConfig.java
index 5535d7fa24..f83b928da1 100644
--- a/spring-boot-samples/spring-boot-sample-traditional/src/main/java/sample/traditional/config/WebConfig.java
+++ b/spring-boot-samples/spring-boot-sample-traditional/src/main/java/sample/traditional/config/WebConfig.java
@@ -45,6 +45,7 @@ public class WebConfig extends WebMvcConfigurerAdapter {
 	}
 
 	@Bean
+	// Only used when running in embedded servlet
 	public DispatcherServlet dispatcherServlet() {
 		return new DispatcherServlet();
 	}
diff --git a/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/WEB-INF/web.xml b/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/WEB-INF/web.xml
index ba1fd55a14..b7db240932 100644
--- a/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/WEB-INF/web.xml
+++ b/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/WEB-INF/web.xml
@@ -12,7 +12,7 @@
 		</init-param>
 		<init-param>
 			<param-name>contextConfigLocation</param-name>
-			<param-value>org.springframework.issues.config</param-value>
+			<param-value>sample.traditional.config</param-value>
 		</init-param>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
diff --git a/spring-boot-samples/spring-boot-sample-web-static/src/main/java/sample/ui/SampleWebStaticApplication.java b/spring-boot-samples/spring-boot-sample-web-static/src/main/java/sample/ui/SampleWebStaticApplication.java
index 321e37251f..9e338afb1e 100644
--- a/spring-boot-samples/spring-boot-sample-web-static/src/main/java/sample/ui/SampleWebStaticApplication.java
+++ b/spring-boot-samples/spring-boot-sample-web-static/src/main/java/sample/ui/SampleWebStaticApplication.java
@@ -18,14 +18,21 @@ package sample.ui;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.SpringBootServletInitializer;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 @EnableAutoConfiguration
-public class SampleWebStaticApplication {
+public class SampleWebStaticApplication extends SpringBootServletInitializer {
 
 	public static void main(String[] args) throws Exception {
 		SpringApplication.run(SampleWebStaticApplication.class, args);
 	}
 
+	@Override
+	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+		return application.sources(SampleWebStaticApplication.class);
+	}
+
 }