diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/B.java
new file mode 100644
index 000000000000..9e08d19233fe
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/B.java
@@ -0,0 +1,60 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.locking;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.GenericGenerator;
+
+@Entity
+@Table(name = "T_LOCK_B")
+public class B {
+
+	private Long id;
+	private A a;
+	private String value;
+
+	public B() {
+	}
+
+	public B(String value) {
+		this.value = value;
+	}
+
+	@Id
+	@GeneratedValue(generator = "increment")
+	@GenericGenerator(name = "increment", strategy = "increment")
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	@Column(name = "b_value")
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	@OneToOne
+	@JoinColumn(name = "a_id")
+	public A getA() {
+		return a;
+	}
+
+	public void setA(A a) {
+		this.a = a;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteLockWithAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteLockWithAliasTest.java
new file mode 100644
index 000000000000..d03c49ccba82
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteLockWithAliasTest.java
@@ -0,0 +1,99 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.locking;
+
+import org.hibernate.LockMode;
+import org.hibernate.Session;
+import org.hibernate.boot.SessionFactoryBuilder;
+import org.hibernate.dialect.OracleDialect;
+import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.testing.RequiresDialect;
+import org.hibernate.testing.jdbc.SQLStatementInterceptor;
+import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import static java.util.regex.Pattern.MULTILINE;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Bin Chen (bin.chen@team.neustar)
+ */
+public class PessimisticWriteLockWithAliasTest
+		extends BaseNonConfigCoreFunctionalTestCase {
+
+	private SQLStatementInterceptor sqlStatementInterceptor;
+
+	@Override
+	protected Class<?>[] getAnnotatedClasses() {
+		return new Class[]{ A.class, B.class };
+	}
+
+	@Override
+	protected void configureSessionFactoryBuilder(SessionFactoryBuilder sfb) {
+		sqlStatementInterceptor = new SQLStatementInterceptor( sfb );
+	}
+
+	private A entityA;
+	private B entityB;
+
+	@Before
+	public void createTestData() {
+		Session session = sessionFactory().openSession();
+		session.beginTransaction();
+		try {
+			entityA = new A();
+			session.persist( entityA );
+			entityB = new B( "foo" );
+			entityB.setA( entityA );
+			session.persist( entityB );
+		}
+		finally {
+			session.getTransaction().commit();
+			session.close();
+		}
+	}
+
+	@Test @JiraKey("HHH-12866")
+	@RequiresDialect(OracleDialect.class)
+	@RequiresDialect(PostgreSQLDialect.class)
+	public void testSetLockModeWithAlias() {
+
+		Session session = sessionFactory().openSession();
+		session.beginTransaction();
+		try {
+			session.createQuery(
+					"select b from B b left join fetch b.a", B.class )
+					.unwrap( org.hibernate.query.Query.class )
+					.setLockMode( "b", LockMode.PESSIMISTIC_WRITE )
+					.list();
+
+			/*
+			 * The generated SQL would be like: <pre> select b0_.id as id1_1_0_, a1_.id as id1_0_1_, b0_.a_id as
+			 * a_id3_1_0_, b0_.b_value as b_value2_1_0_, a1_.a_value as a_value2_0_1_ from T_LOCK_B b0_ left outer join
+			 * T_LOCK_A a1_ on b0_.a_id=a1_.id for update of b0_.id </pre>
+			 */
+			String lockingQuery = sqlStatementInterceptor.getSqlQueries().getLast().toLowerCase();
+
+			// attempt to get the alias that is specified in the from clause
+			Pattern fromTableAliasPattern = Pattern.compile( "from t_lock_b (\\S+)", CASE_INSENSITIVE | MULTILINE );
+			Matcher aliasGroup = fromTableAliasPattern.matcher( lockingQuery );
+			assertTrue( "Fail to locate alias in the from clause: " + lockingQuery, aliasGroup.find() );
+			assertTrue( "Actual query: " + lockingQuery,
+					lockingQuery.endsWith( " for update of " + aliasGroup.group( 1 ) + ".id" ) // Oracle
+				|| lockingQuery.endsWith( " for no key update of " + aliasGroup.group( 1 ) ) ); // PostgreSQL
+		}
+		finally {
+			session.getTransaction().commit();
+			session.close();
+		}
+	}
+
+}