diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/UserVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/UserVersionTest.java
new file mode 100644
index 0000000000..8fa66a082d
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/UserVersionTest.java
@@ -0,0 +1,201 @@
+package org.hibernate.orm.test.version;
+
+import java.io.Serializable;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.Objects;
+
+import org.hibernate.HibernateException;
+import org.hibernate.boot.MetadataBuilder;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.usertype.UserVersionType;
+
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Version;
+import org.hamcrest.CoreMatchers;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+@TestForIssue( jiraKey = "HHH-15240")
+public class UserVersionTest extends BaseSessionFactoryFunctionalTest {
+
+	private static long versionValue;
+
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] {
+				TestEntity.class
+		};
+	}
+
+	@Override
+	protected void applyMetadataBuilder(MetadataBuilder metadataBuilder) {
+		metadataBuilder.applyBasicType(
+				new CustomVersionUserVersionType(),
+				CustomVersion.class.getName()
+		);
+	}
+
+	@Test
+	public void testIt() {
+		inTransaction(
+				session -> {
+					TestEntity testEntity = new TestEntity( 1 );
+					session.persist( testEntity );
+				}
+		);
+
+		inTransaction(
+				session -> {
+					TestEntity testEntity = session.get( TestEntity.class, 1 );
+					assertThat( testEntity.getVersion().getRev(), CoreMatchers.is( versionValue ) );
+				}
+		);
+	}
+
+
+	@Entity(name = "TestEntity")
+	public static class TestEntity {
+		@Id
+		public int id;
+
+		@Version
+		@Column(name = "revision")
+		CustomVersion version;
+
+		public TestEntity() {
+		}
+
+		public TestEntity(int id) {
+			this.id = id;
+		}
+
+		public int getId() {
+			return id;
+		}
+
+		public CustomVersion getVersion() {
+			return version;
+		}
+	}
+
+	public static class CustomVersion implements Serializable {
+		private final long rev;
+
+
+		public CustomVersion(long rev) {
+			this.rev = rev;
+		}
+
+		public long getRev() {
+			return rev;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if ( this == o ) {
+				return true;
+			}
+			if ( o == null || getClass() != o.getClass() ) {
+				return false;
+			}
+			CustomVersion that = (CustomVersion) o;
+			return rev == that.rev;
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash( rev );
+		}
+	}
+
+	public static class CustomVersionUserVersionType implements UserVersionType<CustomVersion> {
+
+		@Override
+		public int getSqlType() {
+			return Types.BIGINT;
+		}
+
+		@Override
+		public Class<CustomVersion> returnedClass() {
+			return CustomVersion.class;
+		}
+
+		@Override
+		public boolean equals(CustomVersion x, CustomVersion y) throws HibernateException {
+			return x.equals( y );
+		}
+
+		@Override
+		public int hashCode(final CustomVersion x) throws HibernateException {
+			return x.hashCode();
+		}
+
+		@Override
+		public CustomVersion nullSafeGet(
+				ResultSet resultSet,
+				int position,
+				SharedSessionContractImplementor session,
+				Object owner) throws HibernateException, SQLException {
+			return new CustomVersion( resultSet.getLong( position ) );
+		}
+
+		@Override
+		public void nullSafeSet(
+				PreparedStatement statement,
+				CustomVersion value,
+				int index,
+				SharedSessionContractImplementor session) throws HibernateException, SQLException {
+			statement.setLong( index, value.getRev() );
+		}
+
+		@Override
+		public CustomVersion deepCopy(CustomVersion value) throws HibernateException {
+			return value;
+		}
+
+		@Override
+		public boolean isMutable() {
+			return false;
+		}
+
+		@Override
+		public Serializable disassemble(CustomVersion value) {
+			return value;
+		}
+
+		@Override
+		public CustomVersion assemble(Serializable cached, Object owner) throws HibernateException {
+			return (CustomVersion) cached;
+		}
+
+		@Override
+		public CustomVersion replace(CustomVersion original, CustomVersion target, Object owner)
+				throws HibernateException {
+			return original;
+		}
+
+		@Override
+		public CustomVersion seed(SharedSessionContractImplementor session) {
+			return new CustomVersion( ++versionValue );
+		}
+
+		@Override
+		public CustomVersion next(CustomVersion current, SharedSessionContractImplementor session) {
+			return seed( session );
+		}
+
+		@Override
+		public int compare(CustomVersion a, CustomVersion b) {
+			return Long.compare( a.getRev(), b.getRev() );
+		}
+	}
+}