diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/Airport.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/Airport.java
similarity index 93%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/Airport.java
rename to hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/Airport.java
index c8680f50d0..2727a527ac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/Airport.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/Airport.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.orm.test.mapping.lazytoone;
+package org.hibernate.test.mapping.lazytoone;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/Flight.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/Flight.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/Flight.java
rename to hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/Flight.java
index 92d38a1300..7f7ac713ee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/Flight.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/Flight.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.orm.test.mapping.lazytoone;
+package org.hibernate.test.mapping.lazytoone;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedLazyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/InstrumentedLazyToOneTest.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedLazyToOneTest.java
rename to hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/InstrumentedLazyToOneTest.java
index 7f309a4474..5a2671fa5d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedLazyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/InstrumentedLazyToOneTest.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.orm.test.mapping.lazytoone;
+package org.hibernate.test.mapping.lazytoone;
 
 import org.hibernate.Hibernate;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedProxyLazyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/InstrumentedProxyLazyToOneTest.java
similarity index 94%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedProxyLazyToOneTest.java
rename to hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/InstrumentedProxyLazyToOneTest.java
index f123dfacab..6342bbff7a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedProxyLazyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/InstrumentedProxyLazyToOneTest.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.orm.test.mapping.lazytoone;
+package org.hibernate.test.mapping.lazytoone;
 
 import org.hibernate.Hibernate;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
@@ -15,8 +15,6 @@
 
 import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
-import org.hibernate.testing.orm.junit.FailureExpected;
-import org.hibernate.testing.orm.junit.NotImplementedYet;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -72,7 +70,6 @@ protected void cleanupTestData() throws Exception {
 	}
 
 	@Test
-	@FailureExpected(reason = "in 6.0 Bytecode enhancement is not yet fully supported ")
 	public void testEnhancedWithProxy() {
 		final StatisticsImplementor statistics = sessionFactory().getStatistics();
 		statistics.clear();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/LazyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/LazyToOneTest.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/LazyToOneTest.java
rename to hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/LazyToOneTest.java
index d9e1044a8a..023b28b801 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/LazyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/LazyToOneTest.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.orm.test.mapping.lazytoone;
+package org.hibernate.test.mapping.lazytoone;
 
 import org.hibernate.Hibernate;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;