diff --git a/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java b/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java
index d0ee0db55b..a829b18bff 100644
--- a/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java
@@ -277,6 +277,7 @@ public final class CellUtil {
         map.put(BORDER_RIGHT, CellPropertyType.BORDER_RIGHT);
         map.put(BORDER_TOP, CellPropertyType.BORDER_TOP);
         map.put(BOTTOM_BORDER_COLOR, CellPropertyType.BOTTOM_BORDER_COLOR);
+        map.put(DATA_FORMAT, CellPropertyType.DATA_FORMAT);
         map.put(LEFT_BORDER_COLOR, CellPropertyType.LEFT_BORDER_COLOR);
         map.put(RIGHT_BORDER_COLOR, CellPropertyType.RIGHT_BORDER_COLOR);
         map.put(TOP_BORDER_COLOR, CellPropertyType.TOP_BORDER_COLOR);
@@ -290,9 +291,10 @@ public final class CellUtil {
         map.put(INDENTION, CellPropertyType.INDENTION);
         map.put(LOCKED, CellPropertyType.LOCKED);
         map.put(ROTATION, CellPropertyType.ROTATION);
-        map.put(VERTICAL_ALIGNMENT, CellPropertyType.VERTICAL_ALIGNMENT);
         map.put(SHRINK_TO_FIT, CellPropertyType.SHRINK_TO_FIT);
         map.put(QUOTE_PREFIXED, CellPropertyType.QUOTE_PREFIXED);
+        map.put(VERTICAL_ALIGNMENT, CellPropertyType.VERTICAL_ALIGNMENT);
+        map.put(WRAP_TEXT, CellPropertyType.WRAP_TEXT);
         namePropertyMap = Collections.unmodifiableMap(map);
     }
 
diff --git a/poi/src/test/java/org/apache/poi/ss/util/TestCellUtil.java b/poi/src/test/java/org/apache/poi/ss/util/TestCellUtil.java
new file mode 100644
index 0000000000..b7defbef99
--- /dev/null
+++ b/poi/src/test/java/org/apache/poi/ss/util/TestCellUtil.java
@@ -0,0 +1,36 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+package org.apache.poi.ss.util;
+
+import org.apache.poi.ss.usermodel.CellPropertyType;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Test for CellUtil constants
+ */
+class TestCellUtil {
+    @Test
+    void testNamePropertyMap() {
+        Arrays.stream(CellPropertyType.values()).forEach(cellPropertyType ->
+                assertTrue(CellUtil.namePropertyMap.containsValue(cellPropertyType),
+                        "missing " + cellPropertyType));
+    }
+}