diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java
index 2f35d15..add747a 100644
--- a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java
+++ b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java
@@ -75,7 +75,7 @@ public abstract class ForkingClientServerIntegrationTestsSupport extends ClientS
 
 	@AfterClass
 	public static void stopGemFireServer() {
-		stop(gemfireServer);
+		getGemFireServerProcess().ifPresent(ForkingClientServerIntegrationTestsSupport::stop);
 		setGemFireServerProcess(null);
 	}