diff --git a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/expiration/FixedTimeoutSessionExpirationIntegrationTests.java b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/expiration/FixedTimeoutSessionExpirationIntegrationTests.java
index 7f42289..4ea10d2 100644
--- a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/expiration/FixedTimeoutSessionExpirationIntegrationTests.java
+++ b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/expiration/FixedTimeoutSessionExpirationIntegrationTests.java
@@ -138,7 +138,7 @@ public class FixedTimeoutSessionExpirationIntegrationTests extends AbstractGemFi
 		assertThat(session.getId()).isNotNull();
 		assertThat(session.isExpired()).isFalse();
 
-		waitOnCondition(() -> false, 1500L);
+		waitOn(() -> false, 1500L);
 
 		Session loadedSession = get(session.getId());
 
@@ -148,7 +148,7 @@ public class FixedTimeoutSessionExpirationIntegrationTests extends AbstractGemFi
 
 		Session updatedSession = save(touch(loadedSession));
 
-		waitOnCondition(() -> false, 1500L);
+		waitOn(() -> false, 1500L);
 
 		long currentTime = System.currentTimeMillis();
 
diff --git a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/expiration/IdleOverFixedTimeoutSessionExpirationIntegrationTests.java b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/expiration/IdleOverFixedTimeoutSessionExpirationIntegrationTests.java
index cf5426c..f69212a 100644
--- a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/expiration/IdleOverFixedTimeoutSessionExpirationIntegrationTests.java
+++ b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/expiration/IdleOverFixedTimeoutSessionExpirationIntegrationTests.java
@@ -147,7 +147,7 @@ public class IdleOverFixedTimeoutSessionExpirationIntegrationTests extends Abstr
 		Instant creationTime = session.getCreationTime();
 		Instant lastAccessTime = session.getLastAccessedTime();
 
-		waitOnCondition(() -> false, Duration.ofSeconds(1).toMillis());
+		waitOn(() -> false, Duration.ofSeconds(1).toMillis());
 
 		Session loadedSession = get(session.getId());
 
@@ -155,7 +155,7 @@ public class IdleOverFixedTimeoutSessionExpirationIntegrationTests extends Abstr
 		assertThat(loadedSession.isExpired()).isFalse();
 		assertThat(loadedSession.getLastAccessedTime().isAfter(lastAccessTime)).isTrue();
 
-		waitOnCondition(() -> false, Duration.ofSeconds(2).toMillis() + 1);
+		waitOn(() -> false, Duration.ofSeconds(2).toMillis() + 1);
 
 		Session expiredSession = get(loadedSession.getId());
 
diff --git a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/expiration/LazyTimeoutSessionExpirationIntegrationTests.java b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/expiration/LazyTimeoutSessionExpirationIntegrationTests.java
index 687d5e3..3979d83 100644
--- a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/expiration/LazyTimeoutSessionExpirationIntegrationTests.java
+++ b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/expiration/LazyTimeoutSessionExpirationIntegrationTests.java
@@ -70,14 +70,14 @@ public class LazyTimeoutSessionExpirationIntegrationTests extends AbstractGemFir
 		assertThat(session.getId()).isNotEmpty();
 		assertThat(session.isExpired()).isFalse();
 
-		waitOnCondition(() -> false, Duration.ofSeconds(1).toMillis());
+		waitOn(() -> false, Duration.ofSeconds(1).toMillis());
 
 		Session loadedSession = get(session.getId());
 
 		assertThat(loadedSession).isEqualTo(session);
 		assertThat(loadedSession.isExpired()).isFalse();
 
-		waitOnCondition(() -> false, Duration.ofSeconds(1).toMillis() + 1);
+		waitOn(() -> false, Duration.ofSeconds(1).toMillis() + 1);
 
 		Session expiredSession = get(loadedSession.getId());