diff --git a/hibernate-core/src/test/java/org/hibernate/test/jdbc/Boat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/Boat.java
similarity index 86%
rename from hibernate-core/src/test/java/org/hibernate/test/jdbc/Boat.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/Boat.java
index d69ba374d0..9bc2d8ffa0 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/jdbc/Boat.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/Boat.java
@@ -1,10 +1,10 @@
 /*
  * 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>.
+ * 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.jdbc;
+package org.hibernate.orm.test.jdbc;
 
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/jdbc/GeneralWorkTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/GeneralWorkTest.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/jdbc/GeneralWorkTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/GeneralWorkTest.java
index 203b5bcd09..a617b51595 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/jdbc/GeneralWorkTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/GeneralWorkTest.java
@@ -1,10 +1,10 @@
 /*
  * 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>.
+ * 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.jdbc;
+package org.hibernate.orm.test.jdbc;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -30,12 +30,12 @@ import static org.junit.Assert.fail;
 public class GeneralWorkTest extends BaseCoreFunctionalTestCase {
 	@Override
 	public String getBaseForMappings() {
-		return "org/hibernate/test/jdbc/";
+		return "";
 	}
 
 	@Override
 	public String[] getMappings() {
-		return new String[] { "Mappings.hbm.xml" };
+		return new String[] { "org/hibernate/orm/test/jdbc/Mappings.hbm.xml" };
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/test/jdbc/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/Mappings.hbm.xml
similarity index 83%
rename from hibernate-core/src/test/java/org/hibernate/test/jdbc/Mappings.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/Mappings.hbm.xml
index 18ad12094c..03fc804f59 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/jdbc/Mappings.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/Mappings.hbm.xml
@@ -2,14 +2,14 @@
 <!--
   ~ 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>.
+  ~ 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
   -->
 <!DOCTYPE hibernate-mapping PUBLIC
       "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
           "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
-<hibernate-mapping package="org.hibernate.test.jdbc">
+<hibernate-mapping package="org.hibernate.orm.test.jdbc">
 
     <class name="Person" table="T_JDBC_PERSON">
         <id name="id" column="ID">
diff --git a/hibernate-core/src/test/java/org/hibernate/test/jdbc/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/Person.java
similarity index 84%
rename from hibernate-core/src/test/java/org/hibernate/test/jdbc/Person.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/Person.java
index 1958dda46b..07e747a532 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/jdbc/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/Person.java
@@ -1,10 +1,10 @@
 /*
  * 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>.
+ * 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.jdbc;
+package org.hibernate.orm.test.jdbc;
 
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/jdbc/env/DefaultSchemaNameResolverTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/DefaultSchemaNameResolverTest.java
similarity index 99%
rename from hibernate-core/src/test/java/org/hibernate/test/jdbc/env/DefaultSchemaNameResolverTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/DefaultSchemaNameResolverTest.java
index 7e068fe5c0..fb2c3fe69b 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/jdbc/env/DefaultSchemaNameResolverTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/DefaultSchemaNameResolverTest.java
@@ -4,7 +4,7 @@
  * 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.jdbc.env;
+package org.hibernate.orm.test.jdbc.env;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/jdbc/env/NoDatabaseMetaDataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/NoDatabaseMetaDataTest.java
similarity index 99%
rename from hibernate-core/src/test/java/org/hibernate/test/jdbc/env/NoDatabaseMetaDataTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/NoDatabaseMetaDataTest.java
index 61f993fb6b..5be5a1b989 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/jdbc/env/NoDatabaseMetaDataTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/NoDatabaseMetaDataTest.java
@@ -4,7 +4,7 @@
  * 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.jdbc.env;
+package org.hibernate.orm.test.jdbc.env;
 
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/jdbc/env/TestKeywordRecognition.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/TestKeywordRecognition.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/test/jdbc/env/TestKeywordRecognition.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/TestKeywordRecognition.java
index 8fd30f352f..7bdb34a234 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/jdbc/env/TestKeywordRecognition.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/env/TestKeywordRecognition.java
@@ -4,7 +4,7 @@
  * 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.jdbc.env;
+package org.hibernate.orm.test.jdbc.env;
 
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.registry.StandardServiceRegistry;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/jdbc/internal/AggressiveReleaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/AggressiveReleaseTest.java
similarity index 99%
rename from hibernate-core/src/test/java/org/hibernate/test/jdbc/internal/AggressiveReleaseTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/AggressiveReleaseTest.java
index ff19199c91..60199d99bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/jdbc/internal/AggressiveReleaseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/AggressiveReleaseTest.java
@@ -4,7 +4,7 @@
  * 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.jdbc.internal;
+package org.hibernate.orm.test.jdbc.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/jdbc/internal/BasicConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BasicConnectionTest.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/test/jdbc/internal/BasicConnectionTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BasicConnectionTest.java
index 9c9fa089ba..03785a9f04 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/jdbc/internal/BasicConnectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BasicConnectionTest.java
@@ -4,7 +4,7 @@
  * 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.jdbc.internal;
+package org.hibernate.orm.test.jdbc.internal;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/jdbc/internal/BatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BatchingTest.java
similarity index 99%
rename from hibernate-core/src/test/java/org/hibernate/test/jdbc/internal/BatchingTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BatchingTest.java
index b64c79778d..0b40f4c208 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/jdbc/internal/BatchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BatchingTest.java
@@ -4,7 +4,7 @@
  * 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.jdbc.internal;
+package org.hibernate.orm.test.jdbc.internal;
 
 import java.sql.PreparedStatement;
 import java.sql.Statement;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/jdbc/internal/SessionJdbcBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/SessionJdbcBatchTest.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/jdbc/internal/SessionJdbcBatchTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/SessionJdbcBatchTest.java
index fc95433cf1..0ad88fbffb 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/jdbc/internal/SessionJdbcBatchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/SessionJdbcBatchTest.java
@@ -4,7 +4,7 @@
  * 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.jdbc.internal;
+package org.hibernate.orm.test.jdbc.internal;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
@@ -15,12 +15,10 @@ import javax.persistence.Id;
 
 import org.hibernate.Session;
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 
 import org.hibernate.testing.DialectChecks;
 import org.hibernate.testing.RequiresDialectFeature;
-import org.hibernate.testing.SkipForDialect;
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
 import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider;
 import org.junit.Test;
@@ -69,6 +67,13 @@ public class SessionJdbcBatchTest
 		return true;
 	}
 
+	@Override
+	protected void cleanupTestData() throws Exception {
+		inTransaction(
+				(session) -> session.createQuery( "delete Event" ).executeUpdate()
+		);
+	}
+
 	private long id;
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/test/tm/TransactionTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/test/tm/TransactionTimeoutTest.java
index 1025355594..8be901d9af 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/tm/TransactionTimeoutTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/tm/TransactionTimeoutTest.java
@@ -20,7 +20,7 @@ import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.testing.SkipForDialect;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
-import org.hibernate.test.jdbc.Person;
+import org.hibernate.orm.test.jdbc.Person;
 import org.junit.Test;
 
 import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping;