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 439ea627fc..2f40c13907 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
@@ -287,9 +287,10 @@ public class TestAllFiles {
                         errPrefix + " for " + exClass + " expected message '" + exMessage + "' but had '" + actMsg + "': " + e);
 
                 if (actMsg != null &&
-                        // sometimes ArrayIndexOutOfBoundsException has null-message?!?
+                        // in newer JDK versions IndexOutOfBoundsException switch from empty message
+                        // to more useful content
                         // so skip the check for this type of exception if expected message is null
-                        (exMessage != null || !ArrayIndexOutOfBoundsException.class.isAssignableFrom(exClass))) {
+                        (exMessage != null || !IndexOutOfBoundsException.class.isAssignableFrom(exClass))) {
                     assertNotNull(exMessage,
                             errPrefix + "Expected message was null, but actMsg wasn't: Message: " + actMsg + ": " + e);
                     assertTrue(actMsg.contains(exMessage),
diff --git a/test-data/spreadsheet/stress.xls b/test-data/spreadsheet/stress.xls
index 275bc91d8e..686638aa53 100644
Binary files a/test-data/spreadsheet/stress.xls and b/test-data/spreadsheet/stress.xls differ