diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
index 673dc0ad4c..f39109a6fb 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
@@ -5328,12 +5328,12 @@ public abstract class AbstractEntityPersister
 
 	@Override
 	public Serializable getIdentifier(Object entity, SharedSessionContractImplementor session) {
-		return (Serializable) getIdentifierMapping().getPropertyAccess().getGetter().get( entity );
+		return (Serializable) identifierMapping.getPropertyAccess().getGetter().get( entity );
 	}
 
 	@Override
 	public void setIdentifier(Object entity, Serializable id, SharedSessionContractImplementor session) {
-		getIdentifierMapping().getPropertyAccess().getSetter().set( entity, id, getFactory() );
+		identifierMapping.getPropertyAccess().getSetter().set( entity, id, factory );
 	}
 
 	@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java
index 73c868e08e..8bb77d96bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java
@@ -103,7 +103,6 @@ public class SmokeTests {
 	}
 
 	@Test
-	@FailureExpected( reason = "Support for entity-values DomainResults not yet implemented")
 	public void testSelectEntityHqlExecution(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {