diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterAvailableConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterAvailableConfigurationIntegrationTests.java
index 8e3e0893..1ae3eed8 100644
--- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterAvailableConfigurationIntegrationTests.java
+++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterAvailableConfigurationIntegrationTests.java
@@ -28,6 +28,7 @@ import org.apache.geode.cache.client.ClientCache;
 import org.apache.geode.cache.client.ClientRegionShortcut;
 import org.apache.geode.cache.server.CacheServer;
 
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -85,12 +86,14 @@ public class ClusterAvailableConfigurationIntegrationTests extends ForkingClient
 
 	@BeforeClass
 	public static void runGemFireServer() throws IOException {
-
-		ClusterAwareConfiguration.ClusterAwareCondition.reset();
-
 		startGemFireServer(GeodeServerApplication.class);
 	}
 
+	@AfterClass
+	public static void tearDown() {
+		ClusterAwareConfiguration.ClusterAwareCondition.reset();
+	}
+
 	@Autowired
 	private ClientCache clientCache;
 
diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfigurationIntegrationTests.java
index fc019dc5..bf9efbb1 100644
--- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfigurationIntegrationTests.java
+++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfigurationIntegrationTests.java
@@ -24,8 +24,8 @@ import org.apache.geode.cache.GemFireCache;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.client.ClientRegionShortcut;
 
+import org.junit.AfterClass;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -71,8 +71,8 @@ public class ClusterNotAvailableConfigurationIntegrationTests extends Integratio
 
 	private static final String LOG_LEVEL = "error";
 
-	@BeforeClass
-	public static void setup() {
+	@AfterClass
+	public static void tearDown() {
 		ClusterAwareConfiguration.ClusterAwareCondition.reset();
 	}