diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCompressionConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCompressionConfigurationUnitTests.java
index 5b72ba6d..1ab6fa61 100644
--- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCompressionConfigurationUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCompressionConfigurationUnitTests.java
@@ -54,6 +54,7 @@ public class EnableCompressionConfigurationUnitTests {
 	@After
 	public void tearDown() {
 		Optional.ofNullable(this.applicationContext).ifPresent(ConfigurableApplicationContext::close);
+		//GemFireMockObjectsSupport.destroy();
 	}
 
 	private ConfigurableApplicationContext newApplicationContext(Class<?>... annotatedClasses) {
@@ -75,6 +76,7 @@ public class EnableCompressionConfigurationUnitTests {
 		this.applicationContext = newApplicationContext(EnableCompressionForAllRegionsConfiguration.class);
 
 		assertThat(this.applicationContext).isNotNull();
+		assertThat(this.applicationContext.containsBean("ExampleClientRegion")).isFalse();
 
 		Compressor compressor = this.applicationContext.getBean(Compressor.class);
 
@@ -98,6 +100,7 @@ public class EnableCompressionConfigurationUnitTests {
 		Compressor compressor = this.applicationContext.getBean("MockCompressor", Compressor.class);
 
 		assertThat(compressor).isNotNull();
+		assertThat(compressor).isNotInstanceOf(SnappyCompressor.class);
 		assertThat(this.applicationContext.containsBean(SNAPPY_COMPRESSOR_BEAN_NAME)).isTrue();
 
 		Arrays.asList("People", "ExampleClientRegion").forEach(regionName -> {
diff --git a/src/test/java/org/springframework/data/gemfire/test/mock/annotation/GemFireMockObjectsConfiguration.java b/src/test/java/org/springframework/data/gemfire/test/mock/annotation/GemFireMockObjectsConfiguration.java
index 2b69e59a..71a7009b 100644
--- a/src/test/java/org/springframework/data/gemfire/test/mock/annotation/GemFireMockObjectsConfiguration.java
+++ b/src/test/java/org/springframework/data/gemfire/test/mock/annotation/GemFireMockObjectsConfiguration.java
@@ -19,6 +19,7 @@ package org.springframework.data.gemfire.test.mock.annotation;
 import java.lang.annotation.Annotation;
 
 import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportAware;
@@ -46,7 +47,7 @@ import org.springframework.data.gemfire.test.mock.config.GemFireMockObjectsBeanP
  */
 @SuppressWarnings("unused")
 @Configuration
-public class GemFireMockObjectsConfiguration implements ImportAware {
+public class GemFireMockObjectsConfiguration implements ApplicationListener<ContextClosedEvent>, ImportAware {
 
 	private boolean useSingletonCache = false;
 
@@ -91,7 +92,12 @@ public class GemFireMockObjectsConfiguration implements ImportAware {
 	}
 
 	@EventListener
-	public void releaseMockResources(ContextClosedEvent event) {
+	public void releaseMockObjectResources(ContextClosedEvent event) {
 		GemFireMockObjectsSupport.destroy();
 	}
+
+	@Override
+	public void onApplicationEvent(ContextClosedEvent event) {
+		releaseMockObjectResources(event);
+	}
 }