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 07afbf5..4e95aa4 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
@@ -40,6 +40,7 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.springframework.data.gemfire.GemfireUtils;
+import org.springframework.data.gemfire.support.GemfireBeanFactoryLocator;
 import org.springframework.data.gemfire.tests.mock.GemFireMockObjectsSupport;
 import org.springframework.data.gemfire.tests.util.FileUtils;
 import org.springframework.data.gemfire.util.CollectionUtils;
@@ -118,6 +119,11 @@ public abstract class IntegrationTestsSupport {
 		}
 	}
 
+	@AfterClass
+	public static void clearAllBeanFactoryLocators() {
+		GemfireBeanFactoryLocator.clear();
+	}
+
 	@AfterClass
 	public static void destroyAllGemFireMockObjects() {
 		GemFireMockObjectsSupport.destroy();