diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java
index 303a1fc..3348c44 100644
--- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java
+++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java
@@ -29,6 +29,7 @@ import org.springframework.data.gemfire.config.annotation.support.AbstractAnnota
 import org.springframework.data.gemfire.tests.mock.beans.factory.config.GemFireMockObjectsBeanPostProcessor;
 import org.springframework.data.gemfire.tests.mock.context.event.DestroyGemFireMockObjectsApplicationListener;
 import org.springframework.lang.NonNull;
+import org.springframework.test.context.event.AfterTestClassEvent;
 
 /**
  * The {@link GemFireMockObjectsConfiguration} class is a Spring {@link Configuration @Configuration} class
@@ -58,7 +59,7 @@ public class GemFireMockObjectsConfiguration extends AbstractAnnotationConfigSup
 	private boolean useSingletonCache = DEFAULT_USE_SINGLETON_CACHE;
 
 	@SuppressWarnings("unchecked")
-	private Class<? extends ApplicationEvent>[] destroyEventTypes = new Class[0];
+	private Class<? extends ApplicationEvent>[] destroyEventTypes = new Class[] { AfterTestClassEvent.class };
 
 	@Override
 	@SuppressWarnings("unchecked")
diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfigurationUnitTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfigurationUnitTests.java
index de01c77..b96ff1a 100644
--- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfigurationUnitTests.java
+++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfigurationUnitTests.java
@@ -36,6 +36,7 @@ import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.data.gemfire.tests.mock.beans.factory.config.GemFireMockObjectsBeanPostProcessor;
 import org.springframework.data.gemfire.tests.mock.context.event.DestroyGemFireMockObjectsApplicationListener;
 import org.springframework.data.gemfire.tests.util.ReflectionUtils;
+import org.springframework.test.context.event.AfterTestClassEvent;
 
 /**
  * Unit Tests for {@link GemFireMockObjectsConfiguration}.
@@ -55,12 +56,13 @@ public class GemFireMockObjectsConfigurationUnitTests {
 
 		GemFireMockObjectsConfiguration configuration = new GemFireMockObjectsConfiguration();
 
-		assertThat(configuration.getConfiguredDestroyEventTypes()).isEmpty();
+		assertThat(configuration.getConfiguredDestroyEventTypes()).containsExactly(AfterTestClassEvent.class);
 		assertThat(configuration.isUseSingletonCacheConfigured()).isFalse();
 
 		Map<String, Object> enableGemFireMockObjectsAttributes = new HashMap<>();
 
-		enableGemFireMockObjectsAttributes.put("destroyOnEvents", new Class[] { ContextClosedEvent.class });
+		enableGemFireMockObjectsAttributes.put("destroyOnEvents",
+			new Class[] { ContextClosedEvent.class, ContextRefreshedEvent.class });
 		enableGemFireMockObjectsAttributes.put("useSingletonCache", true);
 
 		AnnotationMetadata mockAnnotationMetadata = mock(AnnotationMetadata.class);
@@ -73,7 +75,8 @@ public class GemFireMockObjectsConfigurationUnitTests {
 
 		configuration.setImportMetadata(mockAnnotationMetadata);
 
-		assertThat(configuration.getConfiguredDestroyEventTypes()).containsExactly(ContextClosedEvent.class);
+		assertThat(configuration.getConfiguredDestroyEventTypes())
+			.containsExactly(ContextClosedEvent.class, ContextRefreshedEvent.class);
 		assertThat(configuration.isUseSingletonCacheConfigured()).isTrue();
 
 		verify(mockAnnotationMetadata, times(1))