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 563d7dce14..d487fffe06 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
@@ -136,6 +136,7 @@ public class TestAllFiles {
         final List<Arguments> result = new ArrayList<>(100);
         for (String file : scanner.getIncludedFiles()) {
 			// avoid running on files leftover from previous failed runs
+			// or being created by tests run in parallel
 			if(file.endsWith("-saved.xls") || file.endsWith("TestHPSFWritingFunctionality.doc")) {
 				continue;
 			}
diff --git a/poi/src/test/java/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java b/poi/src/test/java/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java
index 6a36ae6cda..065fe6a70a 100644
--- a/poi/src/test/java/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java
+++ b/poi/src/test/java/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java
@@ -91,6 +91,14 @@ public abstract class BaseTestIteratingXLS {
     @ParameterizedTest
     @MethodSource("files")
     void testMain(File file, Class<? extends Throwable> t) throws Exception {
+        // avoid running files leftover from previous failed runs
+        // or created by tests running in parallel
+        // otherwise this would cause sporadic failures with
+        // parallel test execution
+        if(file.getName().endsWith("-saved.xls")) {
+            return;
+        }
+
         Executable ex = () -> runOneFile(file);
         if (t == null) {
             assertDoesNotThrow(ex);