diff --git a/spring-boot/src/test/java/org/springframework/boot/context/web/ServletContextApplicationContextInitializerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/web/ServletContextApplicationContextInitializerTests.java
new file mode 100644
index 0000000000..2eab0ad873
--- /dev/null
+++ b/spring-boot/src/test/java/org/springframework/boot/context/web/ServletContextApplicationContextInitializerTests.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.context.web;
+
+import javax.servlet.ServletContext;
+
+import org.junit.Test;
+
+import org.springframework.web.context.ConfigurableWebApplicationContext;
+import org.springframework.web.context.WebApplicationContext;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+/**
+ * Tests for {@link ServletContextApplicationContextInitializer}.
+ *
+ * @author Andy Wilkinson
+ */
+public class ServletContextApplicationContextInitializerTests {
+
+	private final ServletContext servletContext = mock(ServletContext.class);
+
+	private final ConfigurableWebApplicationContext applicationContext = mock(
+			ConfigurableWebApplicationContext.class);
+
+	@Test
+	public void servletContextIsSetOnTheApplicationContext() {
+		new ServletContextApplicationContextInitializer(this.servletContext)
+				.initialize(this.applicationContext);
+		verify(this.applicationContext).setServletContext(this.servletContext);
+	}
+
+	@Test
+	public void applicationContextIsNotStoredInServletContextByDefault() {
+		new ServletContextApplicationContextInitializer(this.servletContext)
+				.initialize(this.applicationContext);
+		verify(this.servletContext, times(0)).setAttribute(
+				WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE,
+				this.applicationContext);
+	}
+
+	@Test
+	public void applicationContextCanBeStoredInServletContext() {
+		new ServletContextApplicationContextInitializer(this.servletContext, true)
+				.initialize(this.applicationContext);
+		verify(this.servletContext).setAttribute(
+				WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE,
+				this.applicationContext);
+	}
+
+}