diff --git a/hibernate-core/src/test/java/org/hibernate/test/locking/JoinedInheritanceOptimisticForceIncrementTest.java b/hibernate-core/src/test/java/org/hibernate/test/locking/JoinedInheritanceOptimisticForceIncrementTest.java
new file mode 100644
index 0000000000..e626a692fe
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/locking/JoinedInheritanceOptimisticForceIncrementTest.java
@@ -0,0 +1,106 @@
+/*
+ * 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.locking;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.LockModeType;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.Version;
+
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
+
+/**
+ * @author Jeroen Stiekema (jeroen@stiekema.eu)
+ */
+public class JoinedInheritanceOptimisticForceIncrementTest extends BaseNonConfigCoreFunctionalTestCase {
+
+	@Override
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] { Person.class, Employee.class };
+	}
+
+	@Before
+	public void prepare() {
+		doInHibernate(
+				this::sessionFactory,
+				session -> {
+					Employee employee = new Employee( 1L, "John Doe", 10000 );
+					session.persist( employee );
+				}
+		);
+	}
+
+	@After
+	public void cleanup() {
+		doInHibernate(
+				this::sessionFactory,
+				session -> {
+					session.delete( session.get( Employee.class, 1L ) );
+				}
+		);
+	}
+
+	@Test
+	@TestForIssue(jiraKey = "HHH-11979")
+	public void testForceIncrement() {
+		doInHibernate(
+				this::sessionFactory,
+				session -> {
+					Employee lockedEmployee = session.get( Employee.class, 1L );
+					session.lock( lockedEmployee, LockModeType.OPTIMISTIC_FORCE_INCREMENT );
+				}
+		);
+	}
+
+	@Entity(name = "Person")
+	@Inheritance(strategy = InheritanceType.JOINED)
+	public static class Person {
+		@Id
+		@Column(name = "PERSON_ID")
+		private Long id;
+
+		@Version
+		@Column(name = "ver")
+		private Integer version;
+
+		private String name;
+
+		public Person() {
+		}
+
+		public Person(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+	}
+
+	@Entity(name = "Employee")
+	@PrimaryKeyJoinColumn(name = "EMPLOYEE_ID", referencedColumnName = "PERSON_ID")
+	public static class Employee extends Person {
+
+		private Integer salary;
+
+		public Employee() {
+		}
+
+		public Employee(Long id, String name, Integer salary) {
+			super(id, name);
+			this.salary = salary;
+		}
+	}
+
+}