diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java
index 6a17459..0877f50 100644
--- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java
+++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java
@@ -54,6 +54,7 @@ import org.apache.geode.internal.net.SocketCreatorFactory;
 import org.apache.shiro.util.StringUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
@@ -248,6 +249,14 @@ public abstract class IntegrationTestsSupport {
 			.forEach(InternalDataSerializer::unregister);
 	}
 
+	public static void closeApplicationContext(@Nullable ApplicationContext applicationContext) {
+
+		Optional.ofNullable(applicationContext)
+			.filter(ConfigurableApplicationContext.class::isInstance)
+			.map(ConfigurableApplicationContext.class::cast)
+			.ifPresent(ConfigurableApplicationContext::close);
+	}
+
 	public static void closeGemFireCacheWaitOnCacheClosedEvent() {
 		closeGemFireCacheWaitOnCacheClosedEvent(DEFAULT_WAIT_DURATION);
 	}
diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/SpringApplicationContextIntegrationTestsSupport.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/SpringApplicationContextIntegrationTestsSupport.java
index d7e5110..1851b8a 100644
--- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/SpringApplicationContextIntegrationTestsSupport.java
+++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/SpringApplicationContextIntegrationTestsSupport.java
@@ -55,7 +55,7 @@ public abstract class SpringApplicationContextIntegrationTestsSupport extends In
 
 	@After
 	public void closeApplicationContext() {
-		getOptionalApplicationContext().ifPresent(ConfigurableApplicationContext::close);
+		closeApplicationContext(this.applicationContext);
 	}
 
 	protected ConfigurableApplicationContext newApplicationContext(Class<?>... annotatedClasses) {