diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTest.java
index 0a34d5d467..8b280041a8 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTest.java
@@ -158,6 +158,13 @@ public class EnhancerTest extends BaseUnitTestCase {
 	@TestForIssue( jiraKey = "HHH-10646" )
 	public void testMappedSuperclass() {
 		EnhancerTestUtils.runEnhancerTestTask( MappedSuperclassTestTask.class );
+		EnhancerTestUtils.runEnhancerTestTask( MappedSuperclassTestTask.class, new EnhancerTestContext() {
+			@Override
+			public boolean hasLazyLoadableAttributes(CtClass classDescriptor) {
+				// HHH-10981 - Without lazy loading, the generation of getters and setters has a different code path
+				return false;
+			}
+		} );
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/mapped/MappedSuperclassTestTask.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/mapped/MappedSuperclassTestTask.java
index 5a913bee7d..c36ad65264 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/mapped/MappedSuperclassTestTask.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/mapped/MappedSuperclassTestTask.java
@@ -28,7 +28,7 @@ public class MappedSuperclassTestTask extends AbstractEnhancerTestTask {
 
 	public void execute() {
 		Employee charles = new Employee( "Charles", "Engineer" );
-		charles.oca = 1002;
+		charles.setOca( 1002 );
 
 		// Check that both types of class attributes are being dirty tracked
 		EnhancerTestUtils.checkDirtyTracking( charles, "title", "oca" );
@@ -46,9 +46,9 @@ public class MappedSuperclassTestTask extends AbstractEnhancerTestTask {
 
 	@MappedSuperclass private static class Person {
 
-		@Id String name;
+		@Id private String name;
 
-		@Version long oca;
+		@Version private long oca;
 
 		public Person(String name) {
 			this();