diff --git a/src/test/resources/META-INF/persistence.xml b/src/test/resources/META-INF/persistence.xml
index 5a85d4510..e58401db3 100644
--- a/src/test/resources/META-INF/persistence.xml
+++ b/src/test/resources/META-INF/persistence.xml
@@ -1,57 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
 	<persistence-unit name="spring-data-jpa">
-		<class>org.springframework.data.jpa.domain.sample.AbstractMappedType</class>
 		<class>org.springframework.data.jpa.domain.AbstractPersistable</class>
 		<class>org.springframework.data.jpa.domain.AbstractAuditable</class>
-		<class>org.springframework.data.jpa.domain.sample.Account</class>
 		<class>org.springframework.data.jpa.domain.sample.AbstractAnnotatedAuditable</class>
+		<class>org.springframework.data.jpa.domain.sample.AbstractMappedType</class>
+		<class>org.springframework.data.jpa.domain.sample.Account</class>
+		<class>org.springframework.data.jpa.domain.sample.Address</class>
 		<class>org.springframework.data.jpa.domain.sample.AnnotatedAuditableUser</class>
-		<class>org.springframework.data.jpa.domain.sample.AuditableUser</class>
         <class>org.springframework.data.jpa.domain.sample.AuditableRole</class>
-		<class>org.springframework.data.jpa.domain.sample.Parent</class>
-		<class>org.springframework.data.jpa.domain.sample.PrimitiveVersionProperty</class>
-		<class>org.springframework.data.jpa.domain.sample.PersistableWithIdClass</class>
+		<class>org.springframework.data.jpa.domain.sample.AuditableUser</class>
 		<class>org.springframework.data.jpa.domain.sample.Child</class>
+		<class>org.springframework.data.jpa.domain.sample.ConcreteType1</class>
+		<class>org.springframework.data.jpa.domain.sample.ConcreteType2</class>
+		<class>org.springframework.data.jpa.domain.sample.Customer</class>
+		<class>org.springframework.data.jpa.domain.sample.EmbeddedIdExampleEmployeePK</class>
+		<class>org.springframework.data.jpa.domain.sample.EmbeddedIdExampleEmployee</class>
+		<class>org.springframework.data.jpa.domain.sample.EmbeddedIdExampleDepartment</class>
+		<class>org.springframework.data.jpa.domain.sample.IdClassExampleEmployee</class>
+		<class>org.springframework.data.jpa.domain.sample.IdClassExampleDepartment</class>
+		<class>org.springframework.data.jpa.domain.sample.MailMessage</class>
+		<class>org.springframework.data.jpa.domain.sample.MailSender</class>
+		<class>org.springframework.data.jpa.domain.sample.MailUser</class>
+		<class>org.springframework.data.jpa.domain.sample.Order</class>
+		<class>org.springframework.data.jpa.domain.sample.Parent</class>
+		<class>org.springframework.data.jpa.domain.sample.PersistableWithIdClass</class>
+		<class>org.springframework.data.jpa.domain.sample.PrimitiveVersionProperty</class>
 		<class>org.springframework.data.jpa.domain.sample.Role</class>
-		<class>org.springframework.data.jpa.domain.sample.SpecialUser</class>
-		<class>org.springframework.data.jpa.domain.sample.User</class>
 		<class>org.springframework.data.jpa.domain.sample.SampleEntity</class>
 		<class>org.springframework.data.jpa.domain.sample.SampleEntityPK</class>
 		<class>org.springframework.data.jpa.domain.sample.SampleWithIdClass</class>
 		<class>org.springframework.data.jpa.domain.sample.SampleWithPrimitiveId</class>
 		<class>org.springframework.data.jpa.domain.sample.SampleWithTimestampVersion</class>
+		<class>org.springframework.data.jpa.domain.sample.SpecialUser</class>
+		<class>org.springframework.data.jpa.domain.sample.User</class>
 		<class>org.springframework.data.jpa.domain.sample.VersionedUser</class>
-		<class>org.springframework.data.jpa.domain.sample.AbstractMappedType</class>
-		<class>org.springframework.data.jpa.domain.sample.ConcreteType1</class>
-		<class>org.springframework.data.jpa.domain.sample.ConcreteType2</class>
-		<class>org.springframework.data.jpa.domain.sample.IdClassExampleEmployee</class>
-		<class>org.springframework.data.jpa.domain.sample.IdClassExampleDepartment</class>
-		<class>org.springframework.data.jpa.domain.sample.EmbeddedIdExampleEmployeePK</class>
-		<class>org.springframework.data.jpa.domain.sample.EmbeddedIdExampleEmployee</class>
-		<class>org.springframework.data.jpa.domain.sample.EmbeddedIdExampleDepartment</class>
-		<class>org.springframework.data.jpa.domain.sample.Customer</class>
-		<class>org.springframework.data.jpa.domain.sample.Order</class>
-		<class>org.springframework.data.jpa.domain.sample.Address</class>
-		<class>org.springframework.data.jpa.domain.sample.MailMessage</class>
-		<class>org.springframework.data.jpa.domain.sample.MailSender</class>
-		<class>org.springframework.data.jpa.domain.sample.MailUser</class>
 		<exclude-unlisted-classes>true</exclude-unlisted-classes>
 	</persistence-unit>
 	<persistence-unit name="querydsl">
-		<class>org.springframework.data.jpa.domain.sample.User</class>
 		<class>org.springframework.data.jpa.domain.sample.MailMessage</class>
 		<class>org.springframework.data.jpa.domain.sample.MailSender</class>
 		<class>org.springframework.data.jpa.domain.sample.MailUser</class>
+		<class>org.springframework.data.jpa.domain.sample.User</class>
 		<exclude-unlisted-classes>true</exclude-unlisted-classes>
 	</persistence-unit>
 	<persistence-unit name="cdi">
 		<provider>org.hibernate.ejb.HibernatePersistence</provider>
-		<class>org.springframework.data.jpa.domain.sample.User</class>
-		<class>org.springframework.data.jpa.repository.cdi.Person</class>
 		<class>org.springframework.data.jpa.domain.sample.MailMessage</class>
 		<class>org.springframework.data.jpa.domain.sample.MailSender</class>
 		<class>org.springframework.data.jpa.domain.sample.MailUser</class>
+		<class>org.springframework.data.jpa.domain.sample.User</class>
+		<class>org.springframework.data.jpa.repository.cdi.Person</class>
 		<exclude-unlisted-classes>true</exclude-unlisted-classes>
 		<properties>
 			<property name="hibernate.connection.username" value="sa" />