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 d985af0..619f24f 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
@@ -114,19 +114,19 @@ public abstract class IntegrationTestsSupport {
 	}
 
 	@BeforeClass
-	public static void closeAnyExistingGemFireCacheInstanceBeforeTestExecution() {
+	public static void closeAnyGemFireCacheInstanceBeforeTestExecution() {
 		closeGemFireCacheWaitOnCloseEvent();
 	}
 
 	@BeforeClass
-	public static void closeAnyExistingSocketConfigurationBeforeTestExecution() {
+	public static void closeAnySocketConfigurationBeforeTestExecution() {
 		SocketCreatorFactory.close();
 	}
 
-	@BeforeClass
 	// TODO: Remove once GEODE-7157 (https://issues.apache.org/jira/browse/GEODE-7157) is fixed!
 	//  Do the job of Apache Geode & Pivotal GemFire since it cannot do its own damn job!
-	public static void closeAnyExistingSslConfigurationBeforeTestExecution() {
+	@BeforeClass
+	public static void closeAnySslConfigurationBeforeTestExecution() {
 
 		//SSLConfigurationFactory.close();
 
@@ -149,7 +149,7 @@ public abstract class IntegrationTestsSupport {
 	}
 
 	@BeforeClass
-	public static void stopAnyExistingGemFireLocatorBeforeTestExecution() {
+	public static void stopAnyGemFireLocatorBeforeTestExecution() {
 		stopGemFireLocatorWaitOnStopEvent();
 	}
 
diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/SslConfigurationIntegrationTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/SslConfigurationIntegrationTests.java
index 223ef7b..8d39b1a 100644
--- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/SslConfigurationIntegrationTests.java
+++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/SslConfigurationIntegrationTests.java
@@ -59,7 +59,7 @@ public class SslConfigurationIntegrationTests {
 		assertThat(sslConfigurationFactoryOne).isNotNull();
 		assertThat(getInstance()).isSameAs(sslConfigurationFactoryOne);
 
-		IntegrationTestsSupport.closeAnyExistingSslConfigurationBeforeTestExecution();
+		IntegrationTestsSupport.closeAnySslConfigurationBeforeTestExecution();
 
 		SSLConfigurationFactory sslConfigurationFactoryTwo = getInstance();