diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimeTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimeTypeDescriptor.java
index 058e5b77ef..fcd5834845 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimeTypeDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimeTypeDescriptor.java
@@ -23,7 +23,7 @@
  */
 public class JdbcTimeTypeDescriptor extends AbstractTypeDescriptor<Date> {
 	public static final JdbcTimeTypeDescriptor INSTANCE = new JdbcTimeTypeDescriptor();
-	public static final String TIME_FORMAT = "HH:mm:ss";
+	public static final String TIME_FORMAT = "HH:mm:ss.SSS";
 
 	public static class TimeMutabilityPlan extends MutableMutabilityPlan<Date> {
 		public static final TimeMutabilityPlan INSTANCE = new TimeMutabilityPlan();
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampTypeDescriptor.java
index 47174b9ba0..18e96f29ab 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampTypeDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampTypeDescriptor.java
@@ -23,7 +23,7 @@
  */
 public class JdbcTimestampTypeDescriptor extends AbstractTypeDescriptor<Date> {
 	public static final JdbcTimestampTypeDescriptor INSTANCE = new JdbcTimestampTypeDescriptor();
-	public static final String TIMESTAMP_FORMAT = "yyyy-MM-dd HH:mm:ss";
+	public static final String TIMESTAMP_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
 
 	public static class TimestampMutabilityPlan extends MutableMutabilityPlan<Date> {
 		public static final TimestampMutabilityPlan INSTANCE = new TimestampMutabilityPlan();
diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/descriptor/java/JdbcTimeTypeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/test/type/descriptor/java/JdbcTimeTypeDescriptorTest.java
new file mode 100644
index 0000000000..e2df2bd591
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/type/descriptor/java/JdbcTimeTypeDescriptorTest.java
@@ -0,0 +1,34 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.test.type.descriptor.java;
+
+import java.util.Date;
+
+import org.hibernate.type.descriptor.java.JdbcTimeTypeDescriptor;
+
+/**
+ * @author Owen Farrell
+ */
+public class JdbcTimeTypeDescriptorTest extends AbstractDescriptorTest<Date> {
+	final Date original = new Date();
+	final Date copy = new Date( original.getTime() );
+	final Date different = new Date( original.getTime() + 500L);
+
+	public JdbcTimeTypeDescriptorTest() {
+		super( JdbcTimeTypeDescriptor.INSTANCE );
+	}
+
+	@Override
+	protected Data<Date> getTestData() {
+		return new Data<Date>( original, copy, different );
+	}
+
+	@Override
+	protected boolean shouldBeMutable() {
+		return true;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/descriptor/java/JdbcTimestampTypeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/test/type/descriptor/java/JdbcTimestampTypeDescriptorTest.java
new file mode 100644
index 0000000000..6e9e79c4d3
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/type/descriptor/java/JdbcTimestampTypeDescriptorTest.java
@@ -0,0 +1,34 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.test.type.descriptor.java;
+
+import java.util.Date;
+
+import org.hibernate.type.descriptor.java.JdbcTimestampTypeDescriptor;
+
+/**
+ * @author Owen Farrell
+ */
+public class JdbcTimestampTypeDescriptorTest extends AbstractDescriptorTest<Date> {
+	final Date original = new Date();
+	final Date copy = new Date( original.getTime() );
+	final Date different = new Date( original.getTime() + 500L);
+
+	public JdbcTimestampTypeDescriptorTest() {
+		super( JdbcTimestampTypeDescriptor.INSTANCE );
+	}
+
+	@Override
+	protected Data<Date> getTestData() {
+		return new Data<Date>( original, copy, different );
+	}
+
+	@Override
+	protected boolean shouldBeMutable() {
+		return true;
+	}
+}