diff --git a/pom.xml b/pom.xml
index 82fe6cf23..7e4a74102 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,20 +4,20 @@
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>avaje-javaparent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
 
   <groupId>org.avaje.ebeanorm</groupId>
   <artifactId>avaje-ebeanorm-spring</artifactId>
   <name>avaje-ebeanorm-spring</name>
-  <version>3.1.2-SNAPSHOT</version>
+  <version>3.2.1-SNAPSHOT</version>
   <packaging>jar</packaging>
   <description>Support for Spring transactions and IOC setup of Ebean server config</description>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <spring.framework.version>3.0.0.RELEASE</spring.framework.version>
-    <ebean.mavenenhancer.version>3.1.1</ebean.mavenenhancer.version>
+    <ebean.mavenenhancer.version>3.2.1</ebean.mavenenhancer.version>
   </properties>
 
   <url>http://www.avaje.org</url>
@@ -31,9 +31,9 @@
   </licenses>
 
   <scm>
-    <connection>scm:git:https://github.com/rbygrave/avaje-ebeanorm-spring.git</connection>
-    <developerConnection>scm:git:https://github.com/rbygrave/avaje-ebeanorm-spring.git</developerConnection>
-    <url>https://github.com/rbygrave/avaje-ebeanorm-spring.git</url>
+    <connection>scm:git:https://github.com/avaje-ebeanorm/avaje-ebeanorm-spring.git</connection>
+    <developerConnection>scm:git:https://github.com/avaje-ebeanorm/avaje-ebeanorm-spring.git</developerConnection>
+    <url>https://github.com/avaje-ebeanorm/avaje-ebeanorm-spring.git</url>
   </scm>
 
   <dependencies>
@@ -41,7 +41,14 @@
     <dependency>
       <groupId>org.avaje.ebeanorm</groupId>
       <artifactId>avaje-ebeanorm</artifactId>
-      <version>[3,4)</version>
+      <version>[3.2,4)</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.avaje.ebeanorm</groupId>
+      <artifactId>avaje-ebeanorm-agent</artifactId>
+      <version>3.2.1</version>
+      <scope>test</scope>
     </dependency>
 
     <!-- Spring -->
@@ -143,7 +150,7 @@
             <phase>process-test-classes</phase>
             <configuration>
               <classSource>target/test-classes</classSource>
-              <packages>com.avaje.ebean.**</packages>
+              <packages>com.avaje.**</packages>
               <transformArgs>debug=9</transformArgs>
             </configuration>
             <goals>
diff --git a/src/test/java/com/avaje/ebean/springsupport/Account.java b/src/test/java/com/avaje/test/springsupport/Account.java
similarity index 97%
rename from src/test/java/com/avaje/ebean/springsupport/Account.java
rename to src/test/java/com/avaje/test/springsupport/Account.java
index d898a476b..a527e9652 100644
--- a/src/test/java/com/avaje/ebean/springsupport/Account.java
+++ b/src/test/java/com/avaje/test/springsupport/Account.java
@@ -17,7 +17,7 @@
  * along with Ebean; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
-package com.avaje.ebean.springsupport;
+package com.avaje.test.springsupport;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
diff --git a/src/test/java/com/avaje/ebean/springsupport/EbeanSpringModuleTest.java b/src/test/java/com/avaje/test/springsupport/EbeanSpringModuleTest.java
similarity index 98%
rename from src/test/java/com/avaje/ebean/springsupport/EbeanSpringModuleTest.java
rename to src/test/java/com/avaje/test/springsupport/EbeanSpringModuleTest.java
index 866a02b55..2eecfd646 100644
--- a/src/test/java/com/avaje/ebean/springsupport/EbeanSpringModuleTest.java
+++ b/src/test/java/com/avaje/test/springsupport/EbeanSpringModuleTest.java
@@ -17,7 +17,7 @@
  * along with Ebean; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
-package com.avaje.ebean.springsupport;
+package com.avaje.test.springsupport;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/com/avaje/ebean/springsupport/Role.java b/src/test/java/com/avaje/test/springsupport/Role.java
similarity index 97%
rename from src/test/java/com/avaje/ebean/springsupport/Role.java
rename to src/test/java/com/avaje/test/springsupport/Role.java
index 99adbf370..e6fed39d2 100644
--- a/src/test/java/com/avaje/ebean/springsupport/Role.java
+++ b/src/test/java/com/avaje/test/springsupport/Role.java
@@ -18,7 +18,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-package com.avaje.ebean.springsupport;
+package com.avaje.test.springsupport;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/src/test/java/com/avaje/ebean/springsupport/User.java b/src/test/java/com/avaje/test/springsupport/User.java
similarity index 98%
rename from src/test/java/com/avaje/ebean/springsupport/User.java
rename to src/test/java/com/avaje/test/springsupport/User.java
index 6a4a54316..430d777b7 100644
--- a/src/test/java/com/avaje/ebean/springsupport/User.java
+++ b/src/test/java/com/avaje/test/springsupport/User.java
@@ -18,7 +18,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-package com.avaje.ebean.springsupport;
+package com.avaje.test.springsupport;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/src/test/java/com/avaje/ebean/springsupport/UserService.java b/src/test/java/com/avaje/test/springsupport/UserService.java
similarity index 96%
rename from src/test/java/com/avaje/ebean/springsupport/UserService.java
rename to src/test/java/com/avaje/test/springsupport/UserService.java
index 7375386ae..072824263 100644
--- a/src/test/java/com/avaje/ebean/springsupport/UserService.java
+++ b/src/test/java/com/avaje/test/springsupport/UserService.java
@@ -18,7 +18,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-package com.avaje.ebean.springsupport;
+package com.avaje.test.springsupport;
 
 /**
  * The Interface UserService.
diff --git a/src/test/java/com/avaje/ebean/springsupport/UserServiceImpl.java b/src/test/java/com/avaje/test/springsupport/UserServiceImpl.java
similarity index 98%
rename from src/test/java/com/avaje/ebean/springsupport/UserServiceImpl.java
rename to src/test/java/com/avaje/test/springsupport/UserServiceImpl.java
index 65f844d72..eab077042 100644
--- a/src/test/java/com/avaje/ebean/springsupport/UserServiceImpl.java
+++ b/src/test/java/com/avaje/test/springsupport/UserServiceImpl.java
@@ -18,7 +18,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-package com.avaje.ebean.springsupport;
+package com.avaje.test.springsupport;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Propagation;
diff --git a/src/test/resources/init-database.xml b/src/test/resources/init-database.xml
index a91ec58c8..220ba5051 100644
--- a/src/test/resources/init-database.xml
+++ b/src/test/resources/init-database.xml
@@ -29,9 +29,9 @@
 		<property name="name" value="test"/>
 		<property name="classes">
 			<list>
-				<value>com.avaje.ebean.springsupport.User</value>
-				<value>com.avaje.ebean.springsupport.Role</value>
-				<value>com.avaje.ebean.springsupport.Account</value>
+				<value>com.avaje.test.springsupport.User</value>
+				<value>com.avaje.test.springsupport.Role</value>
+				<value>com.avaje.test.springsupport.Account</value>
 			</list>
 		</property>
 		<property name="dataSource" ref="dataSource"/>
@@ -45,7 +45,7 @@
 		<property name="serverConfig" ref="serverConfig"/>
 	</bean>
 
-	<bean id="userService" class="com.avaje.ebean.springsupport.UserServiceImpl">
+	<bean id="userService" class="com.avaje.test.springsupport.UserServiceImpl">
 		<property name="ebeanServer" ref="ebeanServer"/>
 	</bean>
 </beans>