diff --git a/hibernate-core/src/test/java/org/hibernate/test/flush/NonTransactionalDataAccessTest.java b/hibernate-core/src/test/java/org/hibernate/test/flush/NonTransactionalDataAccessTest.java
new file mode 100644
index 0000000000..f42e050ea8
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/flush/NonTransactionalDataAccessTest.java
@@ -0,0 +1,154 @@
+/*
+ * 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.flush;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.TransactionRequiredException;
+import java.io.Serializable;
+
+import org.hibernate.Session;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.resource.transaction.spi.TransactionStatus;
+
+import org.junit.Test;
+
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+
+import static org.hamcrest.core.IsNot.not;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.junit.Assert.assertThat;
+
+/**
+ * @author Andrea Boriero
+ */
+@TestForIssue(jiraKey = "HHH-10877")
+public class NonTransactionalDataAccessTest extends BaseCoreFunctionalTestCase {
+
+	private String allowUpdateOperationOutsideTransaction = "true";
+
+	@Override
+	protected Class<?>[] getAnnotatedClasses() {
+		return new Class[] {MyEntity.class};
+	}
+
+	@Override
+	protected void configure(Configuration configuration) {
+		configuration.setProperty(
+				AvailableSettings.ALLOW_UPDATE_OUTSIDE_TRANSACTION,
+				allowUpdateOperationOutsideTransaction
+		);
+	}
+
+	@Override
+	protected void prepareTest() throws Exception {
+		try (Session s = openSession()) {
+			final MyEntity entity = new MyEntity( "entity" );
+			s.getTransaction().begin();
+			try {
+				s.save( entity );
+
+				s.getTransaction().commit();
+			}
+			catch (Exception e) {
+				if ( s.getTransaction().getStatus() == TransactionStatus.ACTIVE ) {
+					s.getTransaction().rollback();
+				}
+				throw e;
+			}
+		}
+	}
+
+	@Test
+	public void testFlushAllowingOutOfTransactionUpdateOperations() throws Exception {
+		allowUpdateOperationOutsideTransaction = "true";
+		rebuildSessionFactory();
+		prepareTest();
+		try (Session s = openSession()) {
+			final MyEntity entity = (MyEntity) s.createQuery( "from MyEntity e where e.name = :n" )
+					.setParameter( "n", "entity" )
+					.uniqueResult();
+			assertThat( entity, not( nullValue() ) );
+			entity.setName( "changed" );
+			session.flush();
+		}
+	}
+
+	@Test(expected = TransactionRequiredException.class)
+	public void testFlushDisallowingutOfTransactionUpdateOperations() throws Exception {
+		allowUpdateOperationOutsideTransaction = "false";
+		rebuildSessionFactory();
+		prepareTest();
+		try (Session s = openSession()) {
+			final MyEntity entity = (MyEntity) s.createQuery( "from MyEntity e where e.name = :n" )
+					.setParameter( "n", "entity" )
+					.uniqueResult();
+			assertThat( entity, not( nullValue() ) );
+			entity.setName( "changed" );
+			session.flush();
+		}
+	}
+
+	@Test(expected = TransactionRequiredException.class)
+	public void testFlushOutOfTransaction() throws Exception {
+		allowUpdateOperationOutsideTransaction = "";
+		rebuildSessionFactory();
+		prepareTest();
+		try (Session s = openSession()) {
+			final MyEntity entity = (MyEntity) s.createQuery( "from MyEntity e where e.name = :n" )
+					.setParameter( "n", "entity" )
+					.uniqueResult();
+			assertThat( entity, not( nullValue() ) );
+			entity.setName( "changed" );
+			session.flush();
+		}
+	}
+
+	@Entity(name = "MyEntity")
+	public static class MyEntity {
+		@Id
+		@GeneratedValue(strategy = GenerationType.IDENTITY)
+		long id;
+
+		String name;
+
+		public MyEntity() {
+		}
+
+		public MyEntity(String name) {
+			this.name = name;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
+
+	public final Serializable doInsideTransaction(Session s, java.util.function.Supplier<Serializable> sp) {
+		s.getTransaction().begin();
+		try {
+			final Serializable result = sp.get();
+
+			s.getTransaction().commit();
+			return result;
+		}
+		catch (Exception e) {
+			if ( s.getTransaction().getStatus() == TransactionStatus.ACTIVE ) {
+				s.getTransaction().rollback();
+			}
+			throw e;
+		}
+	}
+}