diff --git a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/util/SimpleResultSyncPoint.java b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/util/SimpleResultSyncPoint.java
index 93baf24b48..d252ff6883 100644
--- a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/util/SimpleResultSyncPoint.java
+++ b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/util/SimpleResultSyncPoint.java
@@ -18,10 +18,10 @@
 
 import org.junit.jupiter.api.Assertions;
 
-public class SimpleResultSyncPoint extends ResultSyncPoint<Boolean, Exception> {
+public class SimpleResultSyncPoint extends ResultSyncPoint<Void, Exception> {
 
     public void signal() {
-        signal(Boolean.TRUE);
+        signal((Void) null);
     }
 
     public void signalFailure() {
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smack/roster/LowLevelRosterIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smack/roster/LowLevelRosterIntegrationTest.java
index 305e9ae478..8879a0dcf1 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smack/roster/LowLevelRosterIntegrationTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smack/roster/LowLevelRosterIntegrationTest.java
@@ -63,10 +63,7 @@ public void presenceUnavailable(FullJid jid, Presence presence) {
         // conOne.
         conTwo.disconnect();
 
-        Boolean result = offlineTriggered.waitForResult(timeout);
-        if (!result) {
-            throw new Exception("presenceUnavailable() was not called");
-        }
+        SimpleResultSyncPoint.assertSuccess(offlineTriggered, timeout, "presenceUnavailable() was not called");
     }
 
 }
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smack/roster/RosterIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smack/roster/RosterIntegrationTest.java
index 55aad5c12d..e8c992175f 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smack/roster/RosterIntegrationTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smack/roster/RosterIntegrationTest.java
@@ -16,8 +16,6 @@
  */
 package org.jivesoftware.smack.roster;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import java.util.Collection;
 import java.util.concurrent.TimeoutException;
 
@@ -101,7 +99,7 @@ private void checkIfAddedAndSubscribed(Collection<Jid> addresses) {
         try {
             rosterOne.createItemAndRequestSubscription(conTwo.getUser().asBareJid(), conTwosRosterName, null);
 
-            assertTrue(addedAndSubscribed.waitForResult(2 * connection.getReplyTimeout()));
+            SimpleResultSyncPoint.assertSuccess(addedAndSubscribed, 2 * connection.getReplyTimeout(), "Did not receive expected roster item.");
         }
         finally {
             rosterTwo.removeSubscribeListener(subscribeListener);