diff --git a/java-dates/src/test/java/com/baeldung/timestamp/StringToTimestampConverterUnitTest.java b/java-dates/src/test/java/com/baeldung/timestamp/StringToTimestampConverterUnitTest.java
new file mode 100644
index 0000000000..2be646eb51
--- /dev/null
+++ b/java-dates/src/test/java/com/baeldung/timestamp/StringToTimestampConverterUnitTest.java
@@ -0,0 +1,22 @@
+package com.baeldung.timestamp;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+public class StringToTimestampConverterUnitTest {
+
+    @Test
+    public void givenDatePattern_whenParsing_thenTimestampIsCorrect() {
+        String pattern = "MMM dd, yyyy HH:mm:ss.SSSSSSSS";
+        String timestampAsString = "Nov 12, 2018 13:02:56.12345678";
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        LocalDateTime localDateTime = LocalDateTime.from(formatter.parse(timestampAsString));
+
+        Timestamp timestamp = Timestamp.valueOf(localDateTime);
+        Assert.assertEquals("2018-11-12 13:02:56.12345678", timestamp.toString());
+    }
+}
\ No newline at end of file
diff --git a/java-dates/src/test/java/com/baeldung/timestamp/TimestampToStringConverterTest.java b/java-dates/src/test/java/com/baeldung/timestamp/TimestampToStringConverterTest.java
new file mode 100644
index 0000000000..b25ff2edb3
--- /dev/null
+++ b/java-dates/src/test/java/com/baeldung/timestamp/TimestampToStringConverterTest.java
@@ -0,0 +1,19 @@
+package com.baeldung.timestamp;
+
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Timestamp;
+import java.time.format.DateTimeFormatter;
+
+public class TimestampToStringConverterTest {
+
+    @Test
+    public void givenDatePattern_whenFormatting_thenResultingStringIsCorrect() {
+        Timestamp timestamp = Timestamp.valueOf("2018-12-12 01:02:03.123456789");
+        DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
+
+        String timestampAsString = formatter.format(timestamp.toLocalDateTime());
+        Assert.assertEquals("2018-12-12T01:02:03.123456789", timestampAsString);
+    }
+}
\ No newline at end of file