diff --git a/ujmp-core/src/main/java/org/ujmp/core/util/UJMPFormat.java b/ujmp-core/src/main/java/org/ujmp/core/util/UJMPFormat.java
index 01a89df22..dc635d2aa 100644
--- a/ujmp-core/src/main/java/org/ujmp/core/util/UJMPFormat.java
+++ b/ujmp-core/src/main/java/org/ujmp/core/util/UJMPFormat.java
@@ -30,7 +30,6 @@
 import java.text.Format;
 import java.text.NumberFormat;
 import java.text.ParsePosition;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import org.ujmp.core.Coordinates;
@@ -62,7 +61,7 @@ public UJMPFormat(boolean multiLine, int width, boolean usePadding) {
 		symbols.setInfinity("Inf");
 		defaultNumberFormat = new DecimalFormat("0.0000", symbols);
 		exponentialNumberFormat = new DecimalFormat("0.000E000", symbols);
-		dateFormat = new SimpleDateFormat("yyyy-mm-dd");
+		dateFormat = DateUtil.DATEFORMAT;
 		this.multiLine = multiLine;
 		this.width = width;
 		this.usePadding = usePadding;
diff --git a/ujmp-core/src/test/java/org/ujmp/core/util/AllTests.java b/ujmp-core/src/test/java/org/ujmp/core/util/AllTests.java
index 9de8268df..329e0f935 100644
--- a/ujmp-core/src/test/java/org/ujmp/core/util/AllTests.java
+++ b/ujmp-core/src/test/java/org/ujmp/core/util/AllTests.java
@@ -27,6 +27,6 @@
 import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
-@Suite.SuiteClasses({ TestStringUtil.class, TestXMLUtil.class, ByteBufferConcatenationTest.class })
+@Suite.SuiteClasses({ TestStringUtil.class, TestUJMPFormat.class, TestXMLUtil.class, ByteBufferConcatenationTest.class })
 public class AllTests {
 }
diff --git a/ujmp-core/src/test/java/org/ujmp/core/util/TestUJMPFormat.java b/ujmp-core/src/test/java/org/ujmp/core/util/TestUJMPFormat.java
new file mode 100644
index 000000000..acd150d96
--- /dev/null
+++ b/ujmp-core/src/test/java/org/ujmp/core/util/TestUJMPFormat.java
@@ -0,0 +1,21 @@
+package org.ujmp.core.util;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Calendar;
+
+import org.junit.Test;
+
+public class TestUJMPFormat {
+
+	@Test
+	public void testDatFormat() throws Exception {
+		final UJMPFormat format = new UJMPFormat(true, 15, true);
+		final Calendar cal = Calendar.getInstance();
+		cal.set(2018, Calendar.DECEMBER, 31, 15, 59, 55);
+		final String text = format.format(cal.getTime());
+		
+		assertEquals("2018-12-31     ", text);
+	}
+
+}