diff --git a/poi-integration/src/test/java/org/apache/poi/stress/TestAllFiles.java b/poi-integration/src/test/java/org/apache/poi/stress/TestAllFiles.java
index ece5daca7a..39192fb331 100644
--- a/poi-integration/src/test/java/org/apache/poi/stress/TestAllFiles.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/TestAllFiles.java
@@ -215,12 +215,12 @@ public class TestAllFiles {
         if (exClass != null && AssertionFailedError.class.isAssignableFrom(exClass)) {
             try {
                 exec.execute();
-                fail(errPrefix + "Expected failed assertion");
+                fail(errPrefix + "Expected failed assertion " + exClass + " and message " + exMessage);
             } catch (AssertionFailedError e) {
                 String actMsg = pathReplace(e.getMessage());
                 assertEquals(exMessage, actMsg, errPrefix);
             } catch (Throwable e) {
-                fail(errPrefix + "Unexpected exception", e);
+                fail(errPrefix + "Unexpected exception, expected " + exClass + " and message " + exMessage, e);
             }
         } else if (exClass != null) {
             Exception e = assertThrows((Class<? extends Exception>)exClass, exec);