diff --git a/hibernate-core/src/test/java/org/hibernate/test/stateless/StatelessSessionNativeQueryInsertTest.java b/hibernate-core/src/test/java/org/hibernate/test/stateless/StatelessSessionNativeQueryInsertTest.java
new file mode 100644
index 0000000000..03269f2f0a
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/stateless/StatelessSessionNativeQueryInsertTest.java
@@ -0,0 +1,56 @@
+/*
+ * 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.stateless;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.hibernate.StatelessSession;
+import org.hibernate.query.NativeQuery;
+
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+import org.junit.Test;
+
+import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
+
+/**
+ * @author Andrea Boriero
+ */
+public class StatelessSessionNativeQueryInsertTest extends BaseCoreFunctionalTestCase {
+
+	@Override
+	protected Class<?>[] getAnnotatedClasses() {
+		return new Class[] { TestEntity.class };
+	}
+
+	@Test
+	@TestForIssue(jiraKey = "HHH-12141")
+	public void testInsertInStatelessSession() throws Exception {
+		doInHibernate( this::sessionFactory, session -> {
+			session.doWork( connection -> {
+				StatelessSession sls = sessionFactory().openStatelessSession( connection );
+				NativeQuery q = sls.createNativeQuery(
+						"INSERT INTO TEST_ENTITY (ID,SIMPLE_ATTRIBUTE) values (1,'red')" );
+				q.executeUpdate();
+			} );
+		} );
+	}
+
+	@Entity
+	@Table(name = "TEST_ENTITY")
+	public static class TestEntity {
+		@Id
+		@Column(name = "ID")
+		private Long id;
+
+		@Column(name = "SIMPLE_ATTRIBUTE")
+		private String simpleAttribute;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/stateless/StatelessSessionTest.java b/hibernate-core/src/test/java/org/hibernate/test/stateless/StatelessSessionTest.java
index 2ae3f73a2f..7f555eb4ab 100755
--- a/hibernate-core/src/test/java/org/hibernate/test/stateless/StatelessSessionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/stateless/StatelessSessionTest.java
@@ -12,13 +12,10 @@ import org.hibernate.ScrollMode;
 import org.hibernate.ScrollableResults;
 import org.hibernate.StatelessSession;
 import org.hibernate.Transaction;
-import org.hibernate.query.NativeQuery;
 
-import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Test;
 
-import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
@@ -168,18 +165,5 @@ public class StatelessSessionTest extends BaseCoreFunctionalTestCase {
 		tx.commit();
 		ss.close();
 	}
-
-	@Test
-	@TestForIssue( jiraKey = "HHH-12141" )
-	public void testInsertInStatelessSession() throws Exception {
-		doInHibernate( this::sessionFactory, session -> {
-			session.doWork( connection -> {
-				StatelessSession sls = sessionFactory().openStatelessSession(connection);
-				NativeQuery q = sls.createNativeQuery( "INSERT INTO paper (color) values ('red')");
-				q.executeUpdate();
-			} );
-		} );
-	}
-
 }