diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/instrument/InterceptFieldClassFileTransformerTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/instrument/InterceptFieldClassFileTransformerTest.java
index 57149f5196..afa1a09638 100644
--- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/instrument/InterceptFieldClassFileTransformerTest.java
+++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/instrument/InterceptFieldClassFileTransformerTest.java
@@ -30,7 +30,7 @@ public class InterceptFieldClassFileTransformerTest {
 	
 	@Before
 	public void setup() {
-		entities.add( "org.hibernate.ejb.test.instrument.Simple" );
+		entities.add( "org.hibernate.jpa.test.instrument.Simple" );
 		// use custom class loader which enhances the class
 		InstrumentedClassLoader cl = new InstrumentedClassLoader( Thread.currentThread().getContextClassLoader() );
 		cl.setEntities( entities );
diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/instrument/Simple.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/instrument/Simple.java
index 3056e7e605..adeef1f054 100644
--- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/instrument/Simple.java
+++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/instrument/Simple.java
@@ -3,7 +3,7 @@ package org.hibernate.jpa.test.instrument;
 
 import java.util.Collection;
 
-import org.hibernate.ejb.instrument.InterceptFieldClassFileTransformer;
+import org.hibernate.jpa.internal.instrument.InterceptFieldClassFileTransformer;
 
 
 /**
diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/SimpleRelation.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/instrument/SimpleRelation.java
similarity index 87%
rename from hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/SimpleRelation.java
rename to hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/instrument/SimpleRelation.java
index 0385c97a49..734bb9a857 100644
--- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/SimpleRelation.java
+++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/instrument/SimpleRelation.java
@@ -1,4 +1,4 @@
-package org.hibernate.ejb.test.instrument;
+package org.hibernate.jpa.test.instrument;
 
 /**
  * A simple entity relation used by {@link Simple} to ensure that enhanced