diff --git a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java
index 4f512a1d55..ba89baed3d 100644
--- a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java
@@ -28,6 +28,7 @@ import org.apache.poi.ss.formula.WorkbookEvaluatorProvider;
 import org.apache.poi.ss.usermodel.BaseTestDataFormat;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.DataFormat;
 import org.apache.poi.ss.usermodel.DataFormatter;
 import org.apache.poi.ss.usermodel.FormulaEvaluator;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -158,18 +159,5 @@ public final class TestXSSFDataFormat extends BaseTestDataFormat {
             */
         }
     }
-
-    @Test
-    public void testFormatCellValueDecimal() throws IOException {
-        DataFormatter df = new DataFormatter();
-
-        try (Workbook wb = new XSSFWorkbook()) {
-            Cell cell = wb.createSheet("test").createRow(0).createCell(0);
-            assertEquals("", df.formatCellValue(cell));
-
-            cell.setCellValue(1.005);
-            assertEquals("1.005", df.formatCellValue(cell));
-        }
-    }
-
+    
 }
diff --git a/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
index 98195b11d5..610284fbf6 100644
--- a/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
@@ -29,8 +29,11 @@ import org.apache.poi.hssf.HSSFITestDataProvider;
 import org.apache.poi.ss.usermodel.BaseTestDataFormat;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.DataFormat;
+import org.apache.poi.ss.usermodel.DataFormatter;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.junit.jupiter.api.Test;
 
 /**
diff --git a/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataFormat.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataFormat.java
index eed2fd3cc3..77ac9154d7 100644
--- a/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataFormat.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataFormat.java
@@ -273,4 +273,24 @@ public abstract class BaseTestDataFormat {
             assertEquals("12'345'678", formatter.formatCellValue(lge));
         }
     }
+
+    @Test
+    public void testFormatCellValueDecimal() throws IOException {
+        DataFormatter df = new DataFormatter();
+
+        try (Workbook wb = _testDataProvider.createWorkbook()) {
+            Cell cell = wb.createSheet("test").createRow(0).createCell(0);
+            assertEquals("", df.formatCellValue(cell));
+
+            cell.setCellValue(1.005);
+            assertEquals("1.005", df.formatCellValue(cell));
+
+            DataFormat format = wb.createDataFormat();
+            CellStyle cellStyle = wb.createCellStyle();
+            cellStyle.setDataFormat(format.getFormat("0.00"));
+            cell.setCellStyle(cellStyle);
+            assertEquals("1.01", df.formatCellValue(cell));
+        }
+    }
+
 }