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 93498a5..92d0bba 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
@@ -151,11 +151,6 @@ public abstract class IntegrationTestsSupport {
 		}
 	}
 
-	@AfterClass
-	public static void clearAllBeanFactoryLocators() {
-		GemfireBeanFactoryLocator.clear();
-	}
-
 	@AfterClass
 	public static void clearAllJavaGemFireGeodeAndSpringDotPrefixedSystemProperties() {
 
@@ -166,6 +161,11 @@ public abstract class IntegrationTestsSupport {
 		allSystemPropertyNames.forEach(System::clearProperty);
 	}
 
+	@AfterClass
+	public static void closeAllBeanFactoryLocators() {
+		GemfireBeanFactoryLocator.clear();
+	}
+
 	@AfterClass
 	public static void destroyAllGemFireMockObjects() {
 		GemFireMockObjectsSupport.destroy();