diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionAutoConfiguration.java
index 3356e4f7..77e055b9 100644
--- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionAutoConfiguration.java
+++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionAutoConfiguration.java
@@ -29,6 +29,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.env.EnvironmentPostProcessor;
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
@@ -51,6 +52,7 @@ import org.springframework.util.StringUtils;
  * @author John Blum
  * @see org.apache.geode.cache.GemFireCache
  * @see org.springframework.boot.autoconfigure.EnableAutoConfiguration
+ * @see org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication
  * @see org.springframework.context.annotation.Configuration
  * @see org.springframework.session.Session
  * @see org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession
@@ -64,6 +66,7 @@ import org.springframework.util.StringUtils;
 @ConditionalOnBean(GemFireCache.class)
 @ConditionalOnClass({ GemFireCache.class, GemFireHttpSessionConfiguration.class })
 @ConditionalOnMissingBean(SessionRepositoryFilter.class)
+@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
 @EnableGemFireHttpSession
 @SuppressWarnings("unused")
 public class SpringSessionAutoConfiguration {
diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java
index 0d4d40c5..c9785bfd 100644
--- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java
+++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java
@@ -67,7 +67,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(SpringRunner.class)
 @SpringBootTest(
 	properties = "spring.session.data.gemfire.cache.client.region.shortcut=",
-	webEnvironment = SpringBootTest.WebEnvironment.NONE
+	webEnvironment = SpringBootTest.WebEnvironment.MOCK
 )
 @SuppressWarnings("unused")
 public class AutoConfiguredSessionCachingIntegrationTests extends IntegrationTestsSupport {
diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/CustomConfiguredSessionCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/CustomConfiguredSessionCachingIntegrationTests.java
index 76e3ebec..0d41a6ea 100644
--- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/CustomConfiguredSessionCachingIntegrationTests.java
+++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/CustomConfiguredSessionCachingIntegrationTests.java
@@ -44,6 +44,7 @@ import org.springframework.session.Session;
 import org.springframework.session.data.gemfire.config.annotation.web.http.GemFireHttpSessionConfiguration;
 import org.springframework.session.data.gemfire.config.annotation.web.http.support.SpringSessionGemFireConfigurer;
 import org.springframework.session.data.gemfire.serialization.SessionSerializer;
+import org.springframework.web.context.support.GenericWebApplicationContext;
 
 /**
  * Integration Test for the auto-configuration of Spring Session using either Apache Geode or Pivotal GemFire
@@ -134,6 +135,11 @@ public class CustomConfiguredSessionCachingIntegrationTests extends SpringBootAp
 		return String.format("%1$s.%2$s", SPRING_SESSION_DATA_GEMFIRE_PROPERTY, propertyNameSuffix);
 	}
 
+	@Override
+	protected SpringApplicationBuilder contextClass(SpringApplicationBuilder builder) {
+		return builder.contextClass(GenericWebApplicationContext.class);
+	}
+
 	@Before
 	public void setup() {
 		GemFireMockObjectsSupport.destroy();
diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java
index f00f4549..8757b6bb 100644
--- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java
+++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java
@@ -61,7 +61,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 @SpringBootTest(properties = {
 	"spring.session.data.gemfire.cache.client.region.shortcut=LOCAL",
 	"spring.session.timeout=1",
-}, webEnvironment = SpringBootTest.WebEnvironment.NONE)
+}, webEnvironment = SpringBootTest.WebEnvironment.MOCK)
 @SuppressWarnings("unused")
 public class SessionExpirationIntegrationTests extends IntegrationTestsSupport {