diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/CommitFlushCollectionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/CommitFlushCollectionTest.java
new file mode 100644
index 0000000000..2baf8ce656
--- /dev/null
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/CommitFlushCollectionTest.java
@@ -0,0 +1,209 @@
+/*
+ * 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.flush;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.FetchType;
+import javax.persistence.FlushModeType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.OneToMany;
+import javax.persistence.Version;
+
+import org.hibernate.envers.AuditMappedBy;
+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 static org.junit.Assert.assertEquals;
+
+/**
+ * @author Chris Cranford
+ */
+@TestForIssue(jiraKey = "HHH-12826")
+public class CommitFlushCollectionTest extends BaseEnversJPAFunctionalTestCase {
+
+	@MappedSuperclass
+	public static abstract class AbstractEntity {
+		private Long id;
+		private Long version;
+
+		@Id
+		@GeneratedValue(strategy = GenerationType.IDENTITY)
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		@Version
+		@Column(nullable = false)
+		public Long getVersion() {
+			return version;
+		}
+
+		public void setVersion(Long version) {
+			this.version = version;
+		}
+	}
+
+	@Audited
+	@MappedSuperclass
+	public static class BaseDocument extends AbstractEntity {
+		private String number;
+		private Date date;
+
+		@Column(nullable = false)
+		public String getNumber() {
+			return number;
+		}
+
+		public void setNumber(String number) {
+			this.number = number;
+		}
+
+		@Column(nullable = false)
+		public Date getDate() {
+			return date;
+		}
+
+		public void setDate(Date date) {
+			this.date = date;
+		}
+	}
+
+	@Audited
+	@Entity(name = "DocumentA")
+	public static class DocumentA extends BaseDocument {
+		private List<DocumentLineA> lines = new LinkedList<>();
+
+		@OneToMany(fetch = FetchType.LAZY, mappedBy = "document", cascade = CascadeType.ALL, orphanRemoval = true)
+		@AuditMappedBy(mappedBy = "document")
+		public List<DocumentLineA> getLines() {
+			return lines;
+		}
+
+		public void setLines(List<DocumentLineA> lines) {
+			this.lines = lines;
+		}
+
+		public DocumentA addLine(DocumentLineA line) {
+			if ( line != null ) {
+				line.setDocument( this );
+				getLines().add( line );
+			}
+			return this;
+		}
+	}
+
+	@MappedSuperclass
+	public abstract static class BaseDocumentLine extends AbstractEntity {
+		private String text;
+
+		@Column(nullable = false)
+		public String getText() {
+			return text;
+		}
+
+		public void setText(String text) {
+			this.text = text;
+		}
+	}
+
+	@Audited
+	@Entity(name = "DocumentLineA")
+	public static class DocumentLineA extends BaseDocumentLine {
+		private DocumentA document;
+
+		@ManyToOne(fetch = FetchType.LAZY, optional = false)
+		@JoinColumn(updatable = false, insertable = true, nullable = false)
+		public DocumentA getDocument() {
+			return document;
+		}
+
+		public void setDocument(DocumentA document) {
+			this.document = document;
+		}
+	}
+
+	@Override
+	protected Class<?>[] getAnnotatedClasses() {
+		return new Class<?>[] { DocumentA.class, DocumentLineA.class };
+	}
+
+	private Long persistDocument(FlushModeType flushModeType) {
+		final EntityManager entityManager = getOrCreateEntityManager();
+		try {
+			entityManager.setFlushMode( flushModeType );
+
+			entityManager.getTransaction().begin();
+			DocumentA doc = new DocumentA();
+			doc.setNumber( "1" );
+			doc.setDate( new Date() );
+
+			DocumentLineA line = new DocumentLineA();
+			line.setText( "line1" );
+			doc.addLine( line );
+
+			entityManager.persist( doc );
+			entityManager.getTransaction().commit();
+
+			return doc.getId();
+		}
+		catch ( Exception e ) {
+			if ( entityManager != null && entityManager.getTransaction().isActive() ) {
+				entityManager.getTransaction().rollback();
+			}
+			throw e;
+		}
+		finally {
+			if ( entityManager != null && entityManager.isOpen() ) {
+				entityManager.close();
+			}
+		}
+	}
+
+	private Long entityId1;
+	private Long entityId2;
+
+	@Test
+	@Priority(10)
+	public void initData() {
+		// This failed when using Envers.
+		entityId1 = persistDocument( FlushModeType.COMMIT );
+		// This worked
+		entityId2 = persistDocument( FlushModeType.AUTO );
+	}
+
+	@Test
+	public void testPersistWithFlushModeCommit() {
+		assertEquals( Arrays.asList( 1 ), getAuditReader().getRevisions( DocumentA.class, entityId1 ) );
+	}
+
+	@Test
+	@Priority(1)
+	public void testPersistWithFlushmodeAuto() {
+		assertEquals( Arrays.asList( 2 ), getAuditReader().getRevisions( DocumentA.class, entityId2 ) );
+	}
+}