diff --git a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackIntTest.java b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackIntTest.java
index c372103dc..11334dee8 100644
--- a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackIntTest.java
+++ b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackIntTest.java
@@ -101,7 +101,7 @@ public abstract class AbstractSmackIntTest {
 
     public static <R> R assertResult(ResultSyncPoint<R, ?> syncPoint, long timeout, String message) throws InterruptedException, TimeoutException, AssertionFailedError {
         try {
-            return syncPoint.waitForResult(timeout);
+            return syncPoint.waitForResult(timeout, message);
         } catch (InterruptedException | TimeoutException e) {
             throw e;
         } catch (Exception e) {
diff --git a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/util/ResultSyncPoint.java b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/util/ResultSyncPoint.java
index 37b143934..f7f10b63f 100644
--- a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/util/ResultSyncPoint.java
+++ b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/util/ResultSyncPoint.java
@@ -26,6 +26,10 @@ public class ResultSyncPoint<R, E extends Exception> {
     private E exception;
 
     public R waitForResult(long timeout) throws E, InterruptedException, TimeoutException {
+        return waitForResult(timeout, null);
+    }
+
+    public R waitForResult(long timeout, String timeoutMessage) throws E, InterruptedException, TimeoutException {
         synchronized (this) {
             if (result != null) {
                 return result;
@@ -46,7 +50,7 @@ public class ResultSyncPoint<R, E extends Exception> {
         if (exception != null) {
             throw exception;
         }
-        throw new TimeoutException("Timeout expired");
+        throw new TimeoutException(timeoutMessage == null ? "Timeout expired" : timeoutMessage);
     }