diff --git a/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java b/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java
index 677d9a7b1c..14e217be32 100644
--- a/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java
+++ b/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java
@@ -28,6 +28,7 @@ import java.util.List;
 import java.util.Locale;
 
 import org.apache.poi.POIDataSamples;
+import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.junit.Assume;
 import org.junit.Test;
@@ -82,6 +83,9 @@ public abstract class BaseXLSIteratingTest {
     
 	@Test
 	public void testMain() throws Exception {
+	    // we had intermittent problems when this was set differently somehow, let's try to set it here so it always is set correctly for these tests
+	    Biff8EncryptionKey.setCurrentUserPassword(null);
+	    
 		try {
 			runOneFile(file);
 		} catch (Exception e) {