diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryOrdinalParametersTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryOrdinalParametersTest.java
index 9fd79d9a8a..39824843d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryOrdinalParametersTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryOrdinalParametersTest.java
@@ -6,28 +6,32 @@
  */
 package org.hibernate.jpa.test.query;
 
+import java.util.List;
 import javax.persistence.Entity;
-import javax.persistence.EntityManager;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.ManyToOne;
 import javax.persistence.Query;
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-import java.util.List;
 
 import org.hibernate.Session;
+import org.hibernate.dialect.PostgreSQL82Dialect;
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 import org.hibernate.query.NativeQuery;
 import org.hibernate.query.spi.NativeQueryImplementor;
 
+import org.hibernate.testing.RequiresDialect;
+import org.hibernate.testing.TestForIssue;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import org.hibernate.testing.TestForIssue;
-
+import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author Andrea Boriero
@@ -38,104 +42,134 @@ public class NativeQueryOrdinalParametersTest extends BaseEntityManagerFunctiona
 
 	@Override
 	protected Class<?>[] getAnnotatedClasses() {
-		return new Class[] {Game.class};
+		return new Class[] {
+				Game.class,
+				Node.class
+		};
 	}
 
 	@Before
-	public void setUp(){
-		EntityManager em = getOrCreateEntityManager();
-		try {
-			em.getTransaction().begin();
+	public void setUp() {
+		doInJPA( this::entityManagerFactory, entityManager -> {
 			for ( String title : GAME_TITLES ) {
 				Game game = new Game( title );
-				em.persist( game );
+				entityManager.persist( game );
 			}
-			em.getTransaction().commit();
-		}catch (Exception e){
-			if(em.getTransaction().isActive()){
-				em.getTransaction().rollback();
-			}
-			throw e;
-		}finally {
-			em.close();
-		}
+		} );
 	}
 
 	@After
-	public void tearDown(){
-		EntityManager em = getOrCreateEntityManager();
-		try {
-			em.getTransaction().begin();
-			em.createQuery( "delete from Game" ).executeUpdate();
-			em.getTransaction().commit();
-		}catch (Exception e){
-			if(em.getTransaction().isActive()){
-				em.getTransaction().rollback();
-			}
-			throw e;
-		}finally {
-			em.close();
-		}
+	public void tearDown() {
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			entityManager.createQuery( "delete from Game" ).executeUpdate();
+		} );
 	}
 
 	@Test
 	@TestForIssue(jiraKey = "HHH-10885")
 	public void testNativeQueryIndexedOrdinalParameter() {
-		EntityManager em = getOrCreateEntityManager();
-		try {
-			Query query = em.createNativeQuery( "SELECT * FROM GAME g WHERE title = ?1" );
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			Query query = entityManager.createNativeQuery( "SELECT * FROM GAME g WHERE title = ?1" );
 			query.setParameter( 1, "Super Mario Brothers" );
 			List list = query.getResultList();
 			assertEquals( 1, list.size() );
-		}
-		finally {
-			em.close();
-		}
+		} );
 	}
 
 	@Test
 	@TestForIssue(jiraKey = "HHH-10885")
 	public void testNativeQueryOrdinalParameter() {
-		EntityManager em = getOrCreateEntityManager();
-		try {
-			Query query = em.createNativeQuery( "SELECT * FROM GAME g WHERE title = ?" );
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			Query query = entityManager.createNativeQuery( "SELECT * FROM GAME g WHERE title = ?" );
 			query.setParameter( 1, "Super Mario Brothers" );
 			List list = query.getResultList();
 			assertEquals( 1, list.size() );
-		}
-		finally {
-			em.close();
-		}
+		} );
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-11121")
-	public void testConflictWithSessionNativeQuery(){
-		EntityManager em = getOrCreateEntityManager();
+	@TestForIssue(jiraKey = "HHH-11121")
+	public void testConflictWithSessionNativeQuery() {
 		final String sqlString = "SELECT * FROM GAME g WHERE title = ?";
-		try {
-			NativeQuery sqlQuery = em.unwrap( Session.class ).createSQLQuery( sqlString );
-			sqlQuery.setString( 1, "Super Mario Brothers").setCacheable( true );
+
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			NativeQuery sqlQuery = entityManager.unwrap( Session.class ).createSQLQuery( sqlString );
+			sqlQuery.setString( 1, "Super Mario Brothers" ).setCacheable( true );
 
 			List results = sqlQuery.list();
 			assertEquals( 1, results.size() );
 
-			NativeQueryImplementor query = (NativeQueryImplementor) em.createNativeQuery( sqlString );
+			NativeQueryImplementor query = (NativeQueryImplementor) entityManager.createNativeQuery( sqlString );
 			query.setString( 1, "Super Mario Brothers" );
 			List list = query.list();
 			assertEquals( 1, list.size() );
 
-			sqlQuery = em.unwrap( Session.class ).createSQLQuery( sqlString );
-			sqlQuery.setString( 1, "Super Mario Brothers").setCacheable( true );
+			sqlQuery = entityManager.unwrap( Session.class ).createSQLQuery( sqlString );
+			sqlQuery.setString( 1, "Super Mario Brothers" ).setCacheable( true );
 
 			results = sqlQuery.list();
 			assertEquals( 1, results.size() );
 
 			query.setString( 1, "Super Mario Brothers" );
-		}
-		finally {
-			em.close();
-		}
+		} );
+	}
+
+	@Test
+	@TestForIssue(jiraKey = "HHH-12532")
+	@RequiresDialect(PostgreSQL82Dialect.class)
+	public void testCteNativeQueryOrdinalParameter() {
+
+		Node root1 = new Node();
+		root1.setCode( "ABC" );
+		Node root2 = new Node();
+		root2.setCode( "DEF" );
+
+		Node node11 = new Node();
+		node11.setParent( root1 );
+
+		Node node21 = new Node();
+		node21.setParent( root2 );
+
+		Node node211 = new Node();
+		node211.setParent( node21 );
+
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			entityManager.persist( root1 );
+			entityManager.persist( root2 );
+
+			entityManager.persist( node11 );
+			entityManager.persist( node21 );
+
+			entityManager.persist( node211 );
+		} );
+
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			Query cte = entityManager.createNativeQuery(
+					"WITH RECURSIVE CTE(id, parent_id) AS ( " +
+							"  SELECT id, parent_id " +
+							"  FROM Node " +
+							"  WHERE code like ?1 and parent_id is null" +
+							"  UNION ALL " +
+							"  SELECT child.id, child.parent_id " +
+							"  FROM Node child  " +
+							"  JOIN CTE cte " +
+							"  ON cte.id = child.parent_id " +
+							") SELECT DISTINCT id as integer " +
+							"  FROM CTE cte" );
+
+
+			List<Long> root1Ids = cte.setParameter( 1, "AB%" ).getResultList();
+			assertEquals( 2, root1Ids.size() );
+			assertTrue( root1Ids.contains( root1.getId() ) );
+			assertTrue( root1Ids.contains( node11.getId() ) );
+
+
+			List<Long> root2Ids = cte.setParameter( 1, "DE%" ).getResultList();
+			assertEquals( 3, root2Ids.size() );
+			assertTrue( root2Ids.contains( root2.getId() ) );
+			assertTrue( root2Ids.contains( node21.getId() ) );
+			assertTrue( root2Ids.contains( node211.getId() ) );
+		} );
 	}
 
 	@Entity(name = "Game")
@@ -171,4 +205,42 @@ public class NativeQueryOrdinalParametersTest extends BaseEntityManagerFunctiona
 			this.title = title;
 		}
 	}
+
+	@Entity(name = "Node")
+	@Table(name = "Node")
+	public static class Node {
+
+		@Id
+		@GeneratedValue
+		private Integer id;
+
+		private String code;
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		private Node parent;
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getCode() {
+			return code;
+		}
+
+		public void setCode(String code) {
+			this.code = code;
+		}
+
+		public Node getParent() {
+			return parent;
+		}
+
+		public void setParent(Node parent) {
+			this.parent = parent;
+		}
+	}
 }