diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/generated/GeneratedColumnTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/GeneratedColumnTest.java
similarity index 97%
rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/generated/GeneratedColumnTest.java
rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/GeneratedColumnTest.java
index 161d6ab137..887ce7264c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/generated/GeneratedColumnTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/GeneratedColumnTest.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.envers.test.integration.generated;
+package org.hibernate.orm.test.envers.integration.generated;
 
 import javax.persistence.EntityManager;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/generated/SimpleEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/SimpleEntity.java
similarity index 94%
rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/generated/SimpleEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/SimpleEntity.java
index 5ecd73f803..d72ecef0d9 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/generated/SimpleEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/SimpleEntity.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.envers.test.integration.generated;
+package org.hibernate.orm.test.envers.integration.generated;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/nativequery/EntityResultNativeQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/EntityResultNativeQueryTest.java
similarity index 95%
rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/nativequery/EntityResultNativeQueryTest.java
rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/EntityResultNativeQueryTest.java
index 09755149e9..5ac4bee937 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/nativequery/EntityResultNativeQueryTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/EntityResultNativeQueryTest.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.envers.test.integration.nativequery;
+package org.hibernate.orm.test.envers.integration.nativequery;
 
 import java.util.List;
 import javax.persistence.Query;
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/nativequery/SecondSimpleEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SecondSimpleEntity.java
similarity index 93%
rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/nativequery/SecondSimpleEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SecondSimpleEntity.java
index 3fd9f8249e..89ea6efd27 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/nativequery/SecondSimpleEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SecondSimpleEntity.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.envers.test.integration.nativequery;
+package org.hibernate.orm.test.envers.integration.nativequery;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/nativequery/SimpleEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SimpleEntity.java
similarity index 93%
rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/nativequery/SimpleEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SimpleEntity.java
index e8d3e79fea..9a311e8209 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/nativequery/SimpleEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SimpleEntity.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.envers.test.integration.nativequery;
+package org.hibernate.orm.test.envers.integration.nativequery;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naturalid/Account.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Account.java
similarity index 96%
rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naturalid/Account.java
rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Account.java
index 0b4fd9fce1..58cb822cf6 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naturalid/Account.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Account.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.envers.test.integration.naturalid;
+package org.hibernate.orm.test.envers.integration.naturalid;
 
 import java.io.Serializable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naturalid/Customer.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Customer.java
similarity index 97%
rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naturalid/Customer.java
rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Customer.java
index 425a391ab3..a00b46f35c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naturalid/Customer.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Customer.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.envers.test.integration.naturalid;
+package org.hibernate.orm.test.envers.integration.naturalid;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naturalid/Device.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Device.java
similarity index 96%
rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naturalid/Device.java
rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Device.java
index 52045b1f6e..af53cb5673 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naturalid/Device.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Device.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.envers.test.integration.naturalid;
+package org.hibernate.orm.test.envers.integration.naturalid;
 
 import java.io.Serializable;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naturalid/JoinColumnNaturalIdTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/JoinColumnNaturalIdTest.java
similarity index 97%
rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naturalid/JoinColumnNaturalIdTest.java
rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/JoinColumnNaturalIdTest.java
index d400d1e91d..80119868de 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naturalid/JoinColumnNaturalIdTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/JoinColumnNaturalIdTest.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.envers.test.integration.naturalid;
+package org.hibernate.orm.test.envers.integration.naturalid;
 
 import javax.persistence.EntityManager;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableEntity.java
similarity index 97%
rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableEntity.java
index 8780eaa45d..b3eca71556 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableEntity.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.envers.test.integration.notupdatable;
+package org.hibernate.orm.test.envers.integration.notupdatable;
 
 import java.io.Serializable;
 import javax.persistence.Column;
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableTest.java
similarity index 98%
rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableTest.java
rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableTest.java
index 079d65ef71..c90a3ff473 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableTest.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.envers.test.integration.notupdatable;
+package org.hibernate.orm.test.envers.integration.notupdatable;
 
 import java.util.Arrays;
 import java.util.List;