diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/InheritanceAssociationToOneInnerJoinTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/InheritanceAssociationToOneInnerJoinTest.java
new file mode 100644
index 0000000000..d98860b871
--- /dev/null
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/InheritanceAssociationToOneInnerJoinTest.java
@@ -0,0 +1,210 @@
+/*
+ * 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.envers.test.integration.query;
+
+import java.util.List;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToOne;
+import javax.persistence.criteria.JoinType;
+
+import org.hibernate.envers.Audited;
+import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase;
+import org.hibernate.envers.test.Priority;
+import org.junit.Test;
+
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.transaction.TransactionUtil;
+
+import static org.hibernate.envers.query.AuditEntity.disjunction;
+import static org.hibernate.envers.query.AuditEntity.property;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Chris Cranford
+ */
+@TestForIssue(jiraKey = "HHH-11383")
+public class InheritanceAssociationToOneInnerJoinTest extends BaseEnversJPAFunctionalTestCase {
+	@Override
+	protected Class<?>[] getAnnotatedClasses() {
+		return new Class<?>[] { EntityA.class, EntityB.class, EntityC.class, EntityD.class };
+	}
+
+	@Test
+	@Priority(10)
+	public void initData() {
+		TransactionUtil.doInJPA( this::entityManagerFactory, entityManager -> {
+			final EntityC c = new EntityC();
+			c.setId( 1 );
+			c.setFoo( "bar" );
+			entityManager.persist( c );
+
+			final EntityD d = new EntityD();
+			d.setId( 1 );
+			d.setFoo( "bar" );
+			entityManager.persist( d );
+
+			final EntityB b1 = new EntityB();
+			b1.setId( 1 );
+			b1.setName( "b1" );
+			b1.setRelationToC( c );
+			b1.setRelationToD( d );
+			entityManager.persist( b1 );
+
+			final EntityB b2 = new EntityB();
+			b2.setId( 2 );
+			b2.setName( "b2" );
+			b2.setRelationToC( c );
+			b2.setRelationToD( d );
+			entityManager.persist( b2 );
+		} );
+	}
+
+	@Test
+	public void testAuditQueryWithJoinedInheritanceUsingWithSemanticsManyToOne() {
+		List results = getAuditReader().createQuery().forEntitiesAtRevision( EntityB.class, 1 )
+				.add(
+						disjunction()
+								.add( property( "name" ).like( "b1" ) )
+								.add( property( "name" ).like( "b2" ) ) )
+				.traverseRelation( "relationToC", JoinType.INNER )
+				.add( property( "foo" ).like( "bar" ) )
+				.getResultList();
+		assertEquals( 2, results.size() );
+	}
+
+	@Test
+	public void testAuditQueryWithJoinedInheritanceUsingWithSemanticsOneToOne() {
+		List results = getAuditReader().createQuery().forEntitiesAtRevision( EntityB.class, 1 )
+				.add(
+						disjunction()
+								.add( property( "name" ).like( "b1" ) )
+								.add( property( "name" ).like( "b2" ) ) )
+				.traverseRelation( "relationToD", JoinType.INNER )
+				.add( property( "foo" ).like( "bar" ) )
+				.getResultList();
+		assertEquals( 2, results.size() );
+	}
+
+	@Test
+	public void testAuditQueryWithJoinedInheritanceUsingWithSemanticsToOne() {
+		List results = getAuditReader().createQuery().forEntitiesAtRevision( EntityB.class, 1 )
+				.add(
+						disjunction()
+								.add( property( "name" ).like( "b1" ) )
+								.add( property( "name" ).like( "b2" ) ) )
+				.traverseRelation( "relationToC", JoinType.INNER )
+				.add( property( "foo" ).like( "bar" ) )
+				.up()
+				.traverseRelation( "relationToD", JoinType.INNER )
+				.add( property( "foo" ).like( "bar" ) )
+				.getResultList();
+		assertEquals( 2, results.size() );
+	}
+
+	@Entity(name = "EntityA")
+	@Audited
+	@Inheritance(strategy = InheritanceType.JOINED)
+	public static class EntityA {
+		@Id
+		private Integer id;
+		@OneToOne
+		private EntityD relationToD;
+		@ManyToOne
+		private EntityC relationToC;
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public EntityC getRelationToC() {
+			return relationToC;
+		}
+
+		public void setRelationToC(EntityC relationToC) {
+			this.relationToC = relationToC;
+		}
+
+		public EntityD getRelationToD() {
+			return relationToD;
+		}
+
+		public void setRelationToD(EntityD relationToD) {
+			this.relationToD = relationToD;
+		}
+	}
+
+	@Entity(name = "EntityB")
+	@Audited
+	public static class EntityB extends EntityA {
+		private String name;
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
+
+	@Entity(name = "EntityC")
+	@Audited
+	public static class EntityC {
+		@Id
+		private Integer id;
+		private String foo;
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getFoo() {
+			return foo;
+		}
+
+		public void setFoo(String foo) {
+			this.foo = foo;
+		}
+	}
+
+	@Entity(name = "EntityD")
+	@Audited
+	public static class EntityD {
+		@Id
+		private Integer id;
+		private String foo;
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getFoo() {
+			return foo;
+		}
+
+		public void setFoo(String foo) {
+			this.foo = foo;
+		}
+	}
+}