diff --git a/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/JoinedSubclassWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/JoinedSubclassWithEmbeddableTest.java
index e2ad083fd3..a3e0a279ed 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/JoinedSubclassWithEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/JoinedSubclassWithEmbeddableTest.java
@@ -32,11 +32,10 @@ import java.util.Set;
 
 import org.junit.Test;
 
+import org.hibernate.Session;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 
-import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
-
 /**
  * @author Andrea Boriero
  */
@@ -49,23 +48,29 @@ public class JoinedSubclassWithEmbeddableTest extends BaseCoreFunctionalTestCase
 
 	@Test
 	public void testSelectFromEmbeddedField() {
-		doInHibernate( this::sessionFactory, session -> {
-			session.createNativeQuery( "select * from employee_embeddable_person_map" ).getResultList();
-		} );
+		Session session = openSession();
+		session.getTransaction().begin();
+		session.createSQLQuery( "select * from employee_embeddable_person_map" ).list();
+		session.getTransaction().commit();
+		session.close();
 	}
 
 	@Test
 	public void testSelectFromSubclass() {
-		doInHibernate( this::sessionFactory, session -> {
-			session.createNativeQuery( "select * from embeddable_person_map" ).getResultList();
-		} );
+		Session session = openSession();
+		session.getTransaction().begin();
+		session.createSQLQuery( "select * from embeddable_person_map" ).list();
+		session.getTransaction().commit();
+		session.close();
 	}
 
 	@Test
 	public void testSelectFromParent() {
-		doInHibernate( this::sessionFactory, session -> {
-			session.createNativeQuery( "select * from person_map" ).getResultList();
-		} );
+		Session session = openSession();
+		session.getTransaction().begin();
+		session.createSQLQuery( "select * from person_map" ).list();
+		session.getTransaction().commit();
+		session.close();
 	}
 
 	@Entity
diff --git a/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/SingleTableWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/SingleTableWithEmbeddableTest.java
index 750f679a95..b483c3ab81 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/SingleTableWithEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/SingleTableWithEmbeddableTest.java
@@ -32,11 +32,10 @@ import java.util.Set;
 
 import org.junit.Test;
 
+import org.hibernate.Session;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 
-import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
-
 /**
  * @author Andrea Boriero
  */
@@ -50,23 +49,29 @@ public class SingleTableWithEmbeddableTest extends BaseCoreFunctionalTestCase {
 
 	@Test
 	public void testSelectFromEmbeddedField() {
-		doInHibernate( this::sessionFactory, session -> {
-			session.createNativeQuery( "select * from employee_embeddable_person_map" ).getResultList();
-		} );
+		Session session = openSession();
+		session.getTransaction().begin();
+		session.createSQLQuery( "select * from employee_embeddable_person_map" ).list();
+		session.getTransaction().commit();
+		session.close();
 	}
 
 	@Test
 	public void testSelectFromSubclass() {
-		doInHibernate( this::sessionFactory, session -> {
-			session.createNativeQuery( "select * from embeddable_person_map" ).getResultList();
-		} );
+		Session session = openSession();
+		session.getTransaction().begin();
+		session.createSQLQuery( "select * from embeddable_person_map" ).list();
+		session.getTransaction().commit();
+		session.close();
 	}
 
 	@Test
 	public void testSelectFromParent() {
-		doInHibernate( this::sessionFactory, session -> {
-			session.createNativeQuery( "select * from person_map" ).getResultList();
-		} );
+		Session session = openSession();
+		session.getTransaction().begin();
+		session.createSQLQuery( "select * from person_map" ).list();
+		session.getTransaction().commit();
+		session.close();
 	}
 
 	@Entity
diff --git a/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/TablePerClassWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/TablePerClassWithEmbeddableTest.java
index 59483792d5..864d7da201 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/TablePerClassWithEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/TablePerClassWithEmbeddableTest.java
@@ -32,11 +32,10 @@ import java.util.Set;
 
 import org.junit.Test;
 
+import org.hibernate.Session;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 
-import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
-
 /**
  * @author Andrea Boriero
  */
@@ -49,23 +48,29 @@ public class TablePerClassWithEmbeddableTest extends BaseCoreFunctionalTestCase
 
 	@Test
 	public void testSelectFromEmbeddedField() {
-		doInHibernate( this::sessionFactory, session -> {
-			session.createNativeQuery( "select * from employee_embeddable_person_map" ).getResultList();
-		} );
+		Session session = openSession();
+		session.getTransaction().begin();
+		session.createSQLQuery( "select * from employee_embeddable_person_map" ).list();
+		session.getTransaction().commit();
+		session.close();
 	}
 
 	@Test
 	public void testSelectFromSubclass() {
-		doInHibernate( this::sessionFactory, session -> {
-			session.createNativeQuery( "select * from embeddable_person_map" ).getResultList();
-		} );
+		Session session = openSession();
+		session.getTransaction().begin();
+		session.createSQLQuery( "select * from embeddable_person_map" ).list();
+		session.getTransaction().commit();
+		session.close();
 	}
 
 	@Test
 	public void testSelectFromParent() {
-		doInHibernate( this::sessionFactory, session -> {
-			session.createNativeQuery( "select * from person_map" ).getResultList();
-		} );
+		Session session = openSession();
+		session.getTransaction().begin();
+		session.createSQLQuery( "select * from person_map" ).list();
+		session.getTransaction().commit();
+		session.close();
 	}
 
 	@Entity