diff --git a/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFCell.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFCell.java
index 894bc5c994..b13e2de04a 100644
--- a/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFCell.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFCell.java
@@ -169,4 +169,9 @@ class TestSXSSFCell extends BaseTestXCell {
     @Disabled
     protected void setCellType_FORMULA_onAnArrayFormulaCell_doesNothing() {
     }
+
+    @Override
+    protected boolean enableDateTest() {
+        return false;
+    }
 }
diff --git a/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestCell.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestCell.java
index 0130e9b4f6..18c589b359 100644
--- a/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestCell.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestCell.java
@@ -340,6 +340,10 @@ public abstract class BaseTestCell {
         }
     }
 
+    protected boolean enableDateTest() {
+        return true;
+    }
+
     /**tests the toString() method of HSSFCell*/
     @Test
     void testToString() throws Exception {
@@ -373,7 +377,9 @@ public abstract class BaseTestCell {
             assertEquals("", r.getCell(6).toString(), "Blank");
             // toString on a date-formatted cell displays dates as dd-MMM-yyyy, which has locale problems with the month
             String dateCell1 = r.getCell(7).toString();
-            assertEquals("2/2/10 0:00", dateCell1);
+            if (enableDateTest()) {
+                assertEquals("2/2/10 0:00", dateCell1);
+            }
 
             //Write out the file, read it in, and then check cell values
             try (Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1)) {
@@ -386,7 +392,9 @@ public abstract class BaseTestCell {
                 assertEquals("A1+B1", r.getCell(5).toString(), "Formula");
                 assertEquals("", r.getCell(6).toString(), "Blank");
                 String dateCell2 = r.getCell(7).toString();
-                assertEquals(dateCell1, dateCell2, "Date");
+                if (enableDateTest()) {
+                    assertEquals(dateCell1, dateCell2, "Date");
+                }
             }
         }
     }