diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index ecabe67384..2aef6d5e73 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -43,6 +43,11 @@
             <artifactId>jaxen</artifactId>
             <version>1.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -96,4 +101,27 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>jaxb</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                    <version>2.1</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                    <version>2.1.3</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
 </project>
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/A320.java b/testsuite/src/test/java/org/hibernate/test/annotations/A320.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/A320.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/A320.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/A320b.java b/testsuite/src/test/java/org/hibernate/test/annotations/A320b.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/A320b.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/A320b.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/AlternativeNamingStrategy.java b/testsuite/src/test/java/org/hibernate/test/annotations/AlternativeNamingStrategy.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/AlternativeNamingStrategy.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/AlternativeNamingStrategy.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/AmericaCupClass.java b/testsuite/src/test/java/org/hibernate/test/annotations/AmericaCupClass.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/AmericaCupClass.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/AmericaCupClass.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/Boat.java b/testsuite/src/test/java/org/hibernate/test/annotations/Boat.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/Boat.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/Boat.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/Company.java b/testsuite/src/test/java/org/hibernate/test/annotations/Company.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/Company.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/Company.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/ConfigurationTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/ConfigurationTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/ConfigurationTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/ConfigurationTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/Country.java b/testsuite/src/test/java/org/hibernate/test/annotations/Country.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/Country.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/Country.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/Customer.java b/testsuite/src/test/java/org/hibernate/test/annotations/Customer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/Customer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/Customer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/Discount.java b/testsuite/src/test/java/org/hibernate/test/annotations/Discount.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/Discount.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/Discount.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/EntityTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/EntityTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/EntityTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/EntityTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/Ferry.java b/testsuite/src/test/java/org/hibernate/test/annotations/Ferry.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/Ferry.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/Ferry.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/Flight.java b/testsuite/src/test/java/org/hibernate/test/annotations/Flight.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/Flight.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/Flight.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/FlyingObject.java b/testsuite/src/test/java/org/hibernate/test/annotations/FlyingObject.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/FlyingObject.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/FlyingObject.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/IncorrectEntity.java b/testsuite/src/test/java/org/hibernate/test/annotations/IncorrectEntity.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/IncorrectEntity.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/IncorrectEntity.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/JoinedSubclassTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/JoinedSubclassTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/JoinedSubclassTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/JoinedSubclassTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/Passport.java b/testsuite/src/test/java/org/hibernate/test/annotations/Passport.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/Passport.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/Passport.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/Plane.java b/testsuite/src/test/java/org/hibernate/test/annotations/Plane.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/Plane.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/Plane.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/Port.java b/testsuite/src/test/java/org/hibernate/test/annotations/Port.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/Port.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/Port.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/SafeMappingTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/SafeMappingTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/SafeMappingTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/SafeMappingTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/Sky.java b/testsuite/src/test/java/org/hibernate/test/annotations/Sky.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/Sky.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/Sky.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/TestCase.java b/testsuite/src/test/java/org/hibernate/test/annotations/TestCase.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/TestCase.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/TestCase.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/Thing.java b/testsuite/src/test/java/org/hibernate/test/annotations/Thing.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/Thing.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/Thing.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/Ticket.java b/testsuite/src/test/java/org/hibernate/test/annotations/Ticket.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/Ticket.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/Ticket.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/TicketComparator.java b/testsuite/src/test/java/org/hibernate/test/annotations/TicketComparator.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/TicketComparator.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/TicketComparator.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/AccessTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/AccessTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/AccessTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/AccessTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/Bed.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/Bed.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/Bed.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/Bed.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/BigBed.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/BigBed.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/BigBed.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/BigBed.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/Chair.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/Chair.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/Chair.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/Chair.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/Closet.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/Closet.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/Closet.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/Closet.java
index 5f4ad09b69..856436fc67 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/access/Closet.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/access/Closet.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
 * JBoss, Home of Professional Open Source
 * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/Foobar.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/Foobar.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/Foobar.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/Foobar.java
index 1a7e29dd0f..2b7ee3dacb 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/access/Foobar.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/access/Foobar.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
 * JBoss, Home of Professional Open Source
 * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/Furniture.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/Furniture.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/Furniture.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/Furniture.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/Gardenshed.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/Gardenshed.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/Gardenshed.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/Gardenshed.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/Thingy.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/Thingy.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/Thingy.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/Thingy.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/Woody.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/Woody.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/Woody.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/Woody.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/AccessMappingTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/AccessMappingTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/AccessMappingTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/AccessMappingTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/AccessTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/AccessTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/AccessTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/AccessTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Animal.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Animal.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Animal.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Animal.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Bed.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Bed.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Bed.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Bed.java
index a85d219de3..a7ca7464d6 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Bed.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Bed.java
@@ -1,4 +1,4 @@
-//$Id:$
+//$Id$
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Being.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Being.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Being.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Being.java
index f8d3d4964a..c4f52f4b32 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Being.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Being.java
@@ -1,4 +1,4 @@
-//$Id:$
+//$Id$
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/BigBed.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/BigBed.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/BigBed.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/BigBed.java
index a142f9811a..d5d95829ed 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/BigBed.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/BigBed.java
@@ -1,4 +1,4 @@
-//$Id:$
+//$Id$
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Chair.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Chair.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Chair.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Chair.java
index c420d7048c..c9a59c1bb7 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Chair.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Chair.java
@@ -1,4 +1,4 @@
-//$Id:$
+//$Id$
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Circle.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Circle.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Circle.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Circle.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Color.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Color.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Color.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Color.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Course1.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Course1.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Course1.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Course1.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Course2.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Course2.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Course2.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Course2.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Course3.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Course3.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Course3.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Course3.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Course4.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Course4.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Course4.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Course4.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Course5.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Course5.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Course5.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Course5.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Course6.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Course6.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Course6.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Course6.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Course7.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Course7.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Course7.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Course7.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Course8.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Course8.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Course8.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Course8.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Furniture.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Furniture.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Furniture.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Furniture.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java
index b3a1fd1911..4af5e953c7 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java
@@ -1,4 +1,4 @@
-//$Id:$
+//$Id$
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Horse.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Horse.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Horse.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Horse.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Person.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Person.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Person.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Person.java
index bb6e1d3c5d..7b8d9774d6 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Person.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Person.java
@@ -1,4 +1,4 @@
-//$Id:$
+//$Id$
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Position.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Position.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Position.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Position.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Shape.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Shape.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Shape.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Shape.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Square.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Square.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Square.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Square.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Student.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Student.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Student.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Student.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Thingy.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Thingy.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Thingy.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Thingy.java
index 33a296b267..02a6773b71 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Thingy.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Thingy.java
@@ -1,4 +1,4 @@
-//$Id:$
+//$Id$
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/User.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/User.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/User.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/User.java
index 4af84a7c21..d2b8109287 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/User.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/User.java
@@ -1,4 +1,4 @@
-//$Id:$
+//$Id$
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Woody.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Woody.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Woody.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Woody.java
index 5e8f1a4b5c..7b89edf00a 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Woody.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Woody.java
@@ -1,4 +1,4 @@
-//$Id:$
+//$Id$
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Boy.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Boy.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/xml/Boy.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Boy.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Cook.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Cook.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/xml/Cook.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Cook.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Crew.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Crew.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/xml/Crew.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Crew.java
index 5d19aebeee..cbf58db939 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Crew.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Crew.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
 * JBoss, Home of Professional Open Source
 * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Driver.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Driver.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/xml/Driver.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Driver.java
index 9b4ddd7f23..999c4faf49 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Driver.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Driver.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
 * JBoss, Home of Professional Open Source
 * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Knive.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Knive.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/xml/Knive.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Knive.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/xml/RentalCar.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/RentalCar.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/xml/RentalCar.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/xml/RentalCar.java
index d59b8f55bd..0737ec7c1d 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/access/xml/RentalCar.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/RentalCar.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
 * JBoss, Home of Professional Open Source
 * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Tourist.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Tourist.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/xml/Tourist.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Tourist.java
index e0610b98d2..8801bdd7f2 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Tourist.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Tourist.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
 * JBoss, Home of Professional Open Source
 * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Waiter.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Waiter.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/xml/Waiter.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Waiter.java
index 229e80afd5..2aca788d06 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Waiter.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Waiter.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
 * JBoss, Home of Professional Open Source
 * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/access/xml/XmlAccessTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/XmlAccessTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/access/xml/XmlAccessTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/access/xml/XmlAccessTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/any/AnyTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/any/AnyTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/any/AnyTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/any/AnyTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/any/CharProperty.java b/testsuite/src/test/java/org/hibernate/test/annotations/any/CharProperty.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/any/CharProperty.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/any/CharProperty.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/any/IntegerProperty.java b/testsuite/src/test/java/org/hibernate/test/annotations/any/IntegerProperty.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/any/IntegerProperty.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/any/IntegerProperty.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/any/LongProperty.java b/testsuite/src/test/java/org/hibernate/test/annotations/any/LongProperty.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/any/LongProperty.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/any/LongProperty.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/any/Property.java b/testsuite/src/test/java/org/hibernate/test/annotations/any/Property.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/any/Property.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/any/Property.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/any/PropertyList.java b/testsuite/src/test/java/org/hibernate/test/annotations/any/PropertyList.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/any/PropertyList.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/any/PropertyList.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/any/PropertyMap.java b/testsuite/src/test/java/org/hibernate/test/annotations/any/PropertyMap.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/any/PropertyMap.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/any/PropertyMap.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/any/PropertySet.java b/testsuite/src/test/java/org/hibernate/test/annotations/any/PropertySet.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/any/PropertySet.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/any/PropertySet.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/any/StringProperty.java b/testsuite/src/test/java/org/hibernate/test/annotations/any/StringProperty.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/any/StringProperty.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/any/StringProperty.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/any/package-info.java b/testsuite/src/test/java/org/hibernate/test/annotations/any/package-info.java
similarity index 98%
rename from annotations/src/test/java/org/hibernate/test/annotations/any/package-info.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/any/package-info.java
index 80f09d24ed..cc1407be4b 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/any/package-info.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/any/package-info.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 @AnyMetaDefs(
 		@AnyMetaDef( name= "Property", metaType = "string", idType = "integer",
 			metaValues = {
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/array/ArrayTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/array/ArrayTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/array/ArrayTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/array/ArrayTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/array/Competitor.java b/testsuite/src/test/java/org/hibernate/test/annotations/array/Competitor.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/array/Competitor.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/array/Competitor.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/array/Contest.java b/testsuite/src/test/java/org/hibernate/test/annotations/array/Contest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/array/Contest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/array/Contest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/backquotes/BackquoteTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/backquotes/BackquoteTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/backquotes/BackquoteTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/backquotes/BackquoteTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/backquotes/Bug.java b/testsuite/src/test/java/org/hibernate/test/annotations/backquotes/Bug.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/backquotes/Bug.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/backquotes/Bug.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/backquotes/Category.java b/testsuite/src/test/java/org/hibernate/test/annotations/backquotes/Category.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/backquotes/Category.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/backquotes/Category.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/backquotes/Printer.java b/testsuite/src/test/java/org/hibernate/test/annotations/backquotes/Printer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/backquotes/Printer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/backquotes/Printer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/backquotes/PrinterCable.java b/testsuite/src/test/java/org/hibernate/test/annotations/backquotes/PrinterCable.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/backquotes/PrinterCable.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/backquotes/PrinterCable.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/Address.java b/testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/Address.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/Address.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/Address.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationAutoTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationAutoTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationAutoTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationAutoTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationDisabledTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationDisabledTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationDisabledTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationDisabledTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationGroupsTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationGroupsTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationGroupsTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationGroupsTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/Button.java b/testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/Button.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/Button.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/Button.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/Color.java b/testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/Color.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/Color.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/Color.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/CupHolder.java b/testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/CupHolder.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/CupHolder.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/CupHolder.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLWithoutCallbackTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLWithoutCallbackTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLWithoutCallbackTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLWithoutCallbackTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/Display.java b/testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/Display.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/Display.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/Display.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/DisplayConnector.java b/testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/DisplayConnector.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/DisplayConnector.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/DisplayConnector.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/HibernateTraversableResolverTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/HibernateTraversableResolverTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/HibernateTraversableResolverTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/HibernateTraversableResolverTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/Music.java b/testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/Music.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/Music.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/Music.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/PowerSupply.java b/testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/PowerSupply.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/PowerSupply.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/PowerSupply.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/Rock.java b/testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/Rock.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/Rock.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/Rock.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/Screen.java b/testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/Screen.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/Screen.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/Screen.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/Strict.java b/testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/Strict.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/Strict.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/Strict.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/Tv.java b/testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/Tv.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/Tv.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/Tv.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/TvOwner.java b/testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/TvOwner.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/TvOwner.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/beanvalidation/TvOwner.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.java b/testsuite/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/bytecode/Tool.java b/testsuite/src/test/java/org/hibernate/test/annotations/bytecode/Tool.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/bytecode/Tool.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/bytecode/Tool.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cascade/CascadeTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/cascade/CascadeTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cascade/CascadeTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cascade/CascadeTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cascade/Mouth.java b/testsuite/src/test/java/org/hibernate/test/annotations/cascade/Mouth.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cascade/Mouth.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cascade/Mouth.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cascade/Tooth.java b/testsuite/src/test/java/org/hibernate/test/annotations/cascade/Tooth.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cascade/Tooth.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cascade/Tooth.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/A.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/A.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/A.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/A.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/AId.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/AId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/AId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/AId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/B.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/B.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/B.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/B.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/C.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/C.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/C.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/C.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/Channel.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/Channel.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/Channel.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/Channel.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/Child.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/Child.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/Child.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/Child.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/ChildPk.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/ChildPk.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/ChildPk.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/ChildPk.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/LittleGenius.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/LittleGenius.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/LittleGenius.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/LittleGenius.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/Order.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/Order.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/Order.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/Order.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/OrderLine.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/OrderLine.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/OrderLine.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/OrderLine.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/OrderLinePk.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/OrderLinePk.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/OrderLinePk.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/OrderLinePk.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/Parent.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/Parent.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/Parent.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/Parent.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/ParentPk.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/ParentPk.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/ParentPk.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/ParentPk.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/Presenter.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/Presenter.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/Presenter.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/Presenter.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/Product.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/Product.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/Product.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/Product.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/SomeEntity.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/SomeEntity.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/SomeEntity.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/SomeEntity.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/TvMagazin.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/TvMagazin.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/TvMagazin.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/TvMagazin.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/TvMagazinPk.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/TvMagazinPk.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/TvMagazinPk.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/TvMagazinPk.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/TvProgram.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/TvProgram.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/TvProgram.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/TvProgram.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/TvProgramIdClass.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/TvProgramIdClass.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/TvProgramIdClass.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/TvProgramIdClass.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/Card.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/Card.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/Card.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/Card.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/CardField.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/CardField.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/CardField.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/CardField.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/EagerKeyManyToOneTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/EagerKeyManyToOneTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/EagerKeyManyToOneTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/EagerKeyManyToOneTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/Key.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/Key.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/Key.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/Key.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/PrimaryKey.java b/testsuite/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/PrimaryKey.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/PrimaryKey.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/PrimaryKey.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Brand.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/Brand.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Brand.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/Brand.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Bug.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/Bug.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Bug.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/Bug.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/BugSystem.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/BugSystem.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/BugSystem.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/BugSystem.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Character.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/Character.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Character.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/Character.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/CountryAttitude.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/CountryAttitude.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/CountryAttitude.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/CountryAttitude.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/FavoriteFood.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/FavoriteFood.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/FavoriteFood.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/FavoriteFood.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Matrix.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/Matrix.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Matrix.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/Matrix.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/OrderByTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/OrderByTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/OrderByTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/OrderByTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Person.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/Person.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Person.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/Person.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Products.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/Products.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Products.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/Products.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/TestCourse.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/TestCourse.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/TestCourse.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/TestCourse.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Toy.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/Toy.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Toy.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/Toy.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Widgets.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/Widgets.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Widgets.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/Widgets.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/A.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/A.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/A.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/A.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/B.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/B.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/B.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/B.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/C.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/C.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/C.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/C.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/DeepCollectionElementTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/DeepCollectionElementTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/DeepCollectionElementTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/DeepCollectionElementTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Contact.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Contact.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Contact.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Contact.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Sale.java b/testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Sale.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Sale.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Sale.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/configuration/package-info.java b/testsuite/src/test/java/org/hibernate/test/annotations/configuration/package-info.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/configuration/package-info.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/configuration/package-info.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/Dependent.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/Dependent.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/Dependent.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/Dependent.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/DependentId.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/DependentId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/DependentId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/DependentId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/Employee.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/Employee.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/Employee.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/Employee.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/Employer.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/Employer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/Employer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/Employer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/EmployerId.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/EmployerId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/EmployerId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/EmployerId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/MedicalHistory.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/MedicalHistory.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/MedicalHistory.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/MedicalHistory.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/Person.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/Person.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/Person.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/Person.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/Dependent.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/Dependent.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/Dependent.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/Dependent.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/DependentId.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/DependentId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/DependentId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/DependentId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/DerivedIdentitySimpleParentIdClassDepTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/DerivedIdentitySimpleParentIdClassDepTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/DerivedIdentitySimpleParentIdClassDepTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/DerivedIdentitySimpleParentIdClassDepTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/Employee.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/Employee.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/Employee.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/Employee.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/Dependent.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/Dependent.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/Dependent.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/Dependent.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/DependentId.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/DependentId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/DependentId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/DependentId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/DerivedIdentitySimpleParentEmbeddedIdDepTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/DerivedIdentitySimpleParentEmbeddedIdDepTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/DerivedIdentitySimpleParentEmbeddedIdDepTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/DerivedIdentitySimpleParentEmbeddedIdDepTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/Employee.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/Employee.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/Employee.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/Employee.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/ExclusiveDependent.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/ExclusiveDependent.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/ExclusiveDependent.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/ExclusiveDependent.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/Customer.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/Customer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/Customer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/Customer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/CustomerInventory.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/CustomerInventory.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/CustomerInventory.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/CustomerInventory.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/CustomerInventoryPK.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/CustomerInventoryPK.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/CustomerInventoryPK.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/CustomerInventoryPK.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/IdClassGeneratedValueManyToOneTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/IdClassGeneratedValueManyToOneTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/IdClassGeneratedValueManyToOneTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/IdClassGeneratedValueManyToOneTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/Item.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/Item.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/Item.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/Item.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/c/Dependent.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/c/Dependent.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/c/Dependent.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/c/Dependent.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/c/DerivedIdentitySimpleParentEmbeddedDepTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/c/DerivedIdentitySimpleParentEmbeddedDepTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/c/DerivedIdentitySimpleParentEmbeddedDepTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/c/DerivedIdentitySimpleParentEmbeddedDepTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/c/Employee.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/c/Employee.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/c/Employee.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/c/Employee.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/Dependent.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/Dependent.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/Dependent.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/Dependent.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/DependentId.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/DependentId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/DependentId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/DependentId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/DerivedIdentityIdClassParentIdClassDepTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/DerivedIdentityIdClassParentIdClassDepTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/DerivedIdentityIdClassParentIdClassDepTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/DerivedIdentityIdClassParentIdClassDepTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/Employee.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/Employee.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/Employee.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/Employee.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/EmployeeId.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/EmployeeId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/EmployeeId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/EmployeeId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Dependent.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Dependent.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Dependent.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Dependent.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/DependentId.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/DependentId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/DependentId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/DependentId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/DerivedIdentityIdClassParentEmbeddedIdDepTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/DerivedIdentityIdClassParentEmbeddedIdDepTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/DerivedIdentityIdClassParentEmbeddedIdDepTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/DerivedIdentityIdClassParentEmbeddedIdDepTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Employee.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Employee.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Employee.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Employee.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/EmployeeId.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/EmployeeId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/EmployeeId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/EmployeeId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/Dependent.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/Dependent.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/Dependent.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/Dependent.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/DependentId.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/DependentId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/DependentId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/DependentId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/DerivedIdentityEmbeddedIdParentIdClassTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/DerivedIdentityEmbeddedIdParentIdClassTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/DerivedIdentityEmbeddedIdParentIdClassTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/DerivedIdentityEmbeddedIdParentIdClassTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/Employee.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/Employee.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/Employee.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/Employee.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/EmployeeId.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/EmployeeId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/EmployeeId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/EmployeeId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/Dependent.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/Dependent.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/Dependent.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/Dependent.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/DependentId.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/DependentId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/DependentId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/DependentId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/DerivedIdentityEmbeddedIdParentEmbeddedIdDepTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/DerivedIdentityEmbeddedIdParentEmbeddedIdDepTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/DerivedIdentityEmbeddedIdParentEmbeddedIdDepTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/DerivedIdentityEmbeddedIdParentEmbeddedIdDepTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/Employee.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/Employee.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/Employee.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/Employee.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/EmployeeId.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/EmployeeId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/EmployeeId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/EmployeeId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/DerivedIdentitySimpleParentSimpleDepTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/DerivedIdentitySimpleParentSimpleDepTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/DerivedIdentitySimpleParentSimpleDepTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/DerivedIdentitySimpleParentSimpleDepTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/FinancialHistory.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/FinancialHistory.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/FinancialHistory.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/FinancialHistory.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/MedicalHistory.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/MedicalHistory.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/MedicalHistory.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/MedicalHistory.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/Person.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/Person.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/Person.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/Person.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/Simple.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/Simple.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/Simple.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/Simple.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java
similarity index 97%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java
index db168e4aa8..067b9a95d1 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java
@@ -1,10 +1,6 @@
 package org.hibernate.test.annotations.derivedidentities.e4.b;
 
 import java.util.Date;
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
 
 import org.hibernate.Session;
 import org.hibernate.test.annotations.TestCase;
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/FinancialHistory.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/FinancialHistory.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/FinancialHistory.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/FinancialHistory.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/MedicalHistory.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/MedicalHistory.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/MedicalHistory.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/MedicalHistory.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/Person.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/Person.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/Person.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/Person.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/DerivedIdentityIdClassParentSameIdTypeIdClassDepTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/DerivedIdentityIdClassParentSameIdTypeIdClassDepTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/DerivedIdentityIdClassParentSameIdTypeIdClassDepTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/DerivedIdentityIdClassParentSameIdTypeIdClassDepTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/MedicalHistory.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/MedicalHistory.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/MedicalHistory.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/MedicalHistory.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/Person.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/Person.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/Person.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/Person.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/PersonId.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/PersonId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/PersonId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/PersonId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/DerivedIdentityIdClassParentSameIdTypeEmbeddedIdDepTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/DerivedIdentityIdClassParentSameIdTypeEmbeddedIdDepTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/DerivedIdentityIdClassParentSameIdTypeEmbeddedIdDepTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/DerivedIdentityIdClassParentSameIdTypeEmbeddedIdDepTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/MedicalHistory.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/MedicalHistory.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/MedicalHistory.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/MedicalHistory.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/Person.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/Person.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/Person.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/Person.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/PersonId.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/PersonId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/PersonId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/PersonId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/c/ForeignGeneratorViaMapsIdTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/c/ForeignGeneratorViaMapsIdTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/c/ForeignGeneratorViaMapsIdTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/c/ForeignGeneratorViaMapsIdTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/c/MedicalHistory.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/c/MedicalHistory.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/c/MedicalHistory.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/c/MedicalHistory.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/c/Person.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/c/Person.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/c/Person.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/c/Person.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/MedicalHistory.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/MedicalHistory.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/MedicalHistory.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/MedicalHistory.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/Person.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/Person.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/Person.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/Person.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/PersonId.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/PersonId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/PersonId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/PersonId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/DerivedIdentityEmbeddedIdParentSameIdTypeEmbeddedIdDepTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/DerivedIdentityEmbeddedIdParentSameIdTypeEmbeddedIdDepTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/DerivedIdentityEmbeddedIdParentSameIdTypeEmbeddedIdDepTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/DerivedIdentityEmbeddedIdParentSameIdTypeEmbeddedIdDepTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/MedicalHistory.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/MedicalHistory.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/MedicalHistory.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/MedicalHistory.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/Person.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/Person.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/Person.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/Person.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/PersonId.java b/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/PersonId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/PersonId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/PersonId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/Flight.java b/testsuite/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/Flight.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/Flight.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/Flight.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/Address.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/Address.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/Address.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/Address.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/AddressType.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/AddressType.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/AddressType.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/AddressType.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/Book.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/Book.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/Book.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/Book.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/CorpType.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/CorpType.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/CorpType.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/CorpType.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/Country.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/Country.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/Country.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/Country.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/Deal.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/Deal.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/Deal.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/Deal.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java
index 7a5639676a..a1b7624f5b 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java
@@ -4,7 +4,6 @@ package org.hibernate.test.annotations.embedded;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/FavoriteThings.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/FavoriteThings.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/FavoriteThings.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/FavoriteThings.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/FixedLeg.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/FixedLeg.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/FixedLeg.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/FixedLeg.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/FloatLeg.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/FloatLeg.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/FloatLeg.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/FloatLeg.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/InternetFavorites.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/InternetFavorites.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/InternetFavorites.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/InternetFavorites.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/InternetProvider.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/InternetProvider.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/InternetProvider.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/InternetProvider.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/Leg.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/Leg.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/Leg.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/Leg.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/LegalStructure.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/LegalStructure.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/LegalStructure.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/LegalStructure.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/Manager.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/Manager.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/Manager.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/Manager.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/Nationality.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/Nationality.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/Nationality.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/Nationality.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/NotonialDeal.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/NotonialDeal.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/NotonialDeal.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/NotonialDeal.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/Person.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/Person.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/Person.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/Person.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticle.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticle.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticle.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticle.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticlePk.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticlePk.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticlePk.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticlePk.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/SpreadDeal.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/SpreadDeal.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/SpreadDeal.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/SpreadDeal.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/Summary.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/Summary.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/Summary.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/Summary.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/Swap.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/Swap.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/Swap.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/Swap.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/URLFavorite.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/URLFavorite.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/URLFavorite.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/URLFavorite.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/VanillaSwap.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/VanillaSwap.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/VanillaSwap.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/VanillaSwap.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/WealthyPerson.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/WealthyPerson.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/WealthyPerson.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/WealthyPerson.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/many2one/Address.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/many2one/Address.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/many2one/Address.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/many2one/Address.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/many2one/Country.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/many2one/Country.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/many2one/Country.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/many2one/Country.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/many2one/EmbeddableWithMany2OneTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/many2one/EmbeddableWithMany2OneTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/many2one/EmbeddableWithMany2OneTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/many2one/EmbeddableWithMany2OneTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/many2one/Person.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/many2one/Person.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/many2one/Person.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/many2one/Person.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/one2many/Alias.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/one2many/Alias.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/one2many/Alias.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/one2many/Alias.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/one2many/Name.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/one2many/Name.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/one2many/Name.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/one2many/Name.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/one2many/Person.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/one2many/Person.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/one2many/Person.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/one2many/Person.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/one2many/PersonName.java b/testsuite/src/test/java/org/hibernate/test/annotations/embedded/one2many/PersonName.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/embedded/one2many/PersonName.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/embedded/one2many/PersonName.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/Address.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/Address.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/Address.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/Address.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/Bid.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/Bid.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/Bid.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/Bid.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/Car.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/Car.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/Car.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/Car.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/CasterStringType.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/CasterStringType.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/CasterStringType.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/CasterStringType.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/CommunityBid.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/CommunityBid.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/CommunityBid.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/CommunityBid.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/ContactDetails.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/ContactDetails.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/ContactDetails.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/ContactDetails.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/Country.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/Country.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/Country.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/Country.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/Drill.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/Drill.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/Drill.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/Drill.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/FirstName.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/FirstName.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/FirstName.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/FirstName.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/Flight.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/Flight.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/Flight.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/Flight.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/Forest.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/Forest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/Forest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/Forest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/FormalLastName.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/FormalLastName.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/FormalLastName.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/FormalLastName.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/Java5FeaturesTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/Java5FeaturesTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/Java5FeaturesTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/Java5FeaturesTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/LastName.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/LastName.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/LastName.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/LastName.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/Length.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/Length.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/Length.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/Length.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/LocalContactDetails.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/LocalContactDetails.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/LocalContactDetails.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/LocalContactDetails.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/MonetaryAmount.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/MonetaryAmount.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/MonetaryAmount.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/MonetaryAmount.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/MonetaryAmountUserType.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/MonetaryAmountUserType.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/MonetaryAmountUserType.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/MonetaryAmountUserType.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/Name.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/Name.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/Name.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/Name.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/Narrative.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/Narrative.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/Narrative.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/Narrative.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/OverseasPhoneNumber.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/OverseasPhoneNumber.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/OverseasPhoneNumber.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/OverseasPhoneNumber.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/Peugot.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/Peugot.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/Peugot.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/Peugot.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/PhoneNumber.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/PhoneNumber.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/PhoneNumber.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/PhoneNumber.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/PhoneNumberType.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/PhoneNumberType.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/PhoneNumberType.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/PhoneNumberType.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/Player.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/Player.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/Player.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/Player.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/PowerDrill.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/PowerDrill.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/PowerDrill.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/PowerDrill.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/Race.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/Race.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/Race.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/Race.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/Ransom.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/Ransom.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/Ransom.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/Ransom.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/SoccerTeam.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/SoccerTeam.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/SoccerTeam.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/SoccerTeam.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/Starred.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/Starred.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/Starred.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/Starred.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/Tool.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/Tool.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/Tool.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/Tool.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/Topic.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/Topic.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/Topic.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/Topic.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/Tree.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/Tree.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/Tree.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/Tree.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/WashingMachine.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/WashingMachine.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/WashingMachine.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/WashingMachine.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/Widget.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/Widget.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/Widget.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/Widget.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/ZipCode.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/ZipCode.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/ZipCode.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/ZipCode.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entity/package-info.java b/testsuite/src/test/java/org/hibernate/test/annotations/entity/package-info.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entity/package-info.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entity/package-info.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entitynonentity/Cellular.java b/testsuite/src/test/java/org/hibernate/test/annotations/entitynonentity/Cellular.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entitynonentity/Cellular.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entitynonentity/Cellular.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entitynonentity/Communication.java b/testsuite/src/test/java/org/hibernate/test/annotations/entitynonentity/Communication.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entitynonentity/Communication.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entitynonentity/Communication.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entitynonentity/EntityNonEntityTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/entitynonentity/EntityNonEntityTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entitynonentity/EntityNonEntityTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entitynonentity/EntityNonEntityTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entitynonentity/GSM.java b/testsuite/src/test/java/org/hibernate/test/annotations/entitynonentity/GSM.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entitynonentity/GSM.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entitynonentity/GSM.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entitynonentity/Interaction.java b/testsuite/src/test/java/org/hibernate/test/annotations/entitynonentity/Interaction.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entitynonentity/Interaction.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entitynonentity/Interaction.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entitynonentity/Phone.java b/testsuite/src/test/java/org/hibernate/test/annotations/entitynonentity/Phone.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entitynonentity/Phone.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entitynonentity/Phone.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/entitynonentity/Voice.java b/testsuite/src/test/java/org/hibernate/test/annotations/entitynonentity/Voice.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/entitynonentity/Voice.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/entitynonentity/Voice.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fetch/Branch.java b/testsuite/src/test/java/org/hibernate/test/annotations/fetch/Branch.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/fetch/Branch.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fetch/Branch.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fetch/FetchingTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/fetch/FetchingTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/fetch/FetchingTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fetch/FetchingTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fetch/Leaf.java b/testsuite/src/test/java/org/hibernate/test/annotations/fetch/Leaf.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/fetch/Leaf.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fetch/Leaf.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fetch/Person.java b/testsuite/src/test/java/org/hibernate/test/annotations/fetch/Person.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/fetch/Person.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fetch/Person.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fetch/Stay.java b/testsuite/src/test/java/org/hibernate/test/annotations/fetch/Stay.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/fetch/Stay.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fetch/Stay.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Country.java b/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Country.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Country.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Country.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer.java b/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java b/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java
index 2b2fde968a..36abe1dcc4 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java b/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java
index 1fb3581cfe..6b87a6b3c9 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java b/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java
index f8f21d68db..70d5768b5a 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java b/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java
index 065f495097..a702079867 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/MoreFetchProfileTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/MoreFetchProfileTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/MoreFetchProfileTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/MoreFetchProfileTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Order.java b/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Order.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Order.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Order.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java b/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java
index f5b6e35e18..820da0a90c 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java b/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java
similarity index 99%
rename from annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java
index b63c795cdb..c4e466e1bc 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java
similarity index 91%
rename from annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java
index e67ad428ce..104a70a853 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 package org.hibernate.test.annotations.fkcircularity;
 
 import javax.persistence.EmbeddedId;
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java
similarity index 91%
rename from annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java
index 13fc0a3853..33f099efc8 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 package org.hibernate.test.annotations.fkcircularity;
 
 import java.io.Serializable;
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java
similarity index 92%
rename from annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java
index d0a05c54b4..a998ca6878 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 package org.hibernate.test.annotations.fkcircularity;
 
 import javax.persistence.Entity;
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java
similarity index 89%
rename from annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java
index ecc547bd32..20073e25db 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 package org.hibernate.test.annotations.fkcircularity;
 
 import javax.persistence.Entity;
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java
similarity index 98%
rename from annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java
index ced0c81e26..87bd5c1c44 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 package org.hibernate.test.annotations.fkcircularity;
 
 import javax.persistence.Column;
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java
similarity index 97%
rename from annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java
index 63188813a0..2d98849990 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 package org.hibernate.test.annotations.fkcircularity;
 
 import javax.persistence.Entity;
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java
similarity index 97%
rename from annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java
index 20c2e5c8f3..7652140e54 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 package org.hibernate.test.annotations.fkcircularity;
 
 import javax.persistence.Entity;
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java
similarity index 97%
rename from annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java
index fa7b2ea055..b9b9971e75 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 package org.hibernate.test.annotations.fkcircularity;
 
 import javax.persistence.Entity;
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java
similarity index 91%
rename from annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java
index 2cae8184fc..f9d131c79e 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 package org.hibernate.test.annotations.fkcircularity;
 
 import javax.persistence.EmbeddedId;
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java
similarity index 91%
rename from annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java
index 0309d6fe6d..0d958b8e16 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 package org.hibernate.test.annotations.fkcircularity;
 
 import java.io.Serializable;
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java
similarity index 96%
rename from annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java
index b4d55dfab3..f5c6cbd368 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 package org.hibernate.test.annotations.fkcircularity;
 
 import java.io.PrintWriter;
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/generics/Classes.java b/testsuite/src/test/java/org/hibernate/test/annotations/generics/Classes.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/generics/Classes.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/generics/Classes.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/generics/DNA.java b/testsuite/src/test/java/org/hibernate/test/annotations/generics/DNA.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/generics/DNA.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/generics/DNA.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/generics/Dummy.java b/testsuite/src/test/java/org/hibernate/test/annotations/generics/Dummy.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/generics/Dummy.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/generics/Dummy.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/generics/Gene.java b/testsuite/src/test/java/org/hibernate/test/annotations/generics/Gene.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/generics/Gene.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/generics/Gene.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/generics/GenericsTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/generics/GenericsTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/generics/GenericsTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/generics/GenericsTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/generics/Item.java b/testsuite/src/test/java/org/hibernate/test/annotations/generics/Item.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/generics/Item.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/generics/Item.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/generics/Paper.java b/testsuite/src/test/java/org/hibernate/test/annotations/generics/Paper.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/generics/Paper.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/generics/Paper.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/generics/PaperType.java b/testsuite/src/test/java/org/hibernate/test/annotations/generics/PaperType.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/generics/PaperType.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/generics/PaperType.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/generics/Price.java b/testsuite/src/test/java/org/hibernate/test/annotations/generics/Price.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/generics/Price.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/generics/Price.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/generics/PricedStuff.java b/testsuite/src/test/java/org/hibernate/test/annotations/generics/PricedStuff.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/generics/PricedStuff.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/generics/PricedStuff.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/generics/SomeGuy.java b/testsuite/src/test/java/org/hibernate/test/annotations/generics/SomeGuy.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/generics/SomeGuy.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/generics/SomeGuy.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/generics/State.java b/testsuite/src/test/java/org/hibernate/test/annotations/generics/State.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/generics/State.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/generics/State.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/generics/StateType.java b/testsuite/src/test/java/org/hibernate/test/annotations/generics/StateType.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/generics/StateType.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/generics/StateType.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/generics/Stuff.java b/testsuite/src/test/java/org/hibernate/test/annotations/generics/Stuff.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/generics/Stuff.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/generics/Stuff.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/generics/UnresolvedTypeTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/generics/UnresolvedTypeTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/generics/UnresolvedTypeTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/generics/UnresolvedTypeTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/generics/WildEntity.java b/testsuite/src/test/java/org/hibernate/test/annotations/generics/WildEntity.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/generics/WildEntity.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/generics/WildEntity.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/genericsinheritance/Child.java b/testsuite/src/test/java/org/hibernate/test/annotations/genericsinheritance/Child.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/genericsinheritance/Child.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/genericsinheritance/Child.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy1.java b/testsuite/src/test/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy1.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy1.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy1.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy2.java b/testsuite/src/test/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy2.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy2.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy2.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy22.java b/testsuite/src/test/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy22.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy22.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy22.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/genericsinheritance/Parent.java b/testsuite/src/test/java/org/hibernate/test/annotations/genericsinheritance/Parent.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/genericsinheritance/Parent.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/genericsinheritance/Parent.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy1.java b/testsuite/src/test/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy1.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy1.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy1.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy2.java b/testsuite/src/test/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy2.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy2.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy2.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy22.java b/testsuite/src/test/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy22.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy22.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy22.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/EnumIdTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/EnumIdTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/EnumIdTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/EnumIdTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/IdClassTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/IdClassTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/IdClassTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/IdClassTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/IdTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/IdTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/IdTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/IdTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/JoinColumnOverrideTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/JoinColumnOverrideTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/JoinColumnOverrideTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/JoinColumnOverrideTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/NewSchemeIdTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/NewSchemeIdTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/NewSchemeIdTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/NewSchemeIdTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/UUIDGenerator.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/UUIDGenerator.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/UUIDGenerator.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/UUIDGenerator.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Ball.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Ball.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/Ball.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Ball.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/BreakDance.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/BreakDance.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/BreakDance.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/BreakDance.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Bunny.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Bunny.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/Bunny.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Bunny.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Computer.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Computer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/Computer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Computer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Department.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Department.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/Department.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Department.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Dog.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Dog.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/Dog.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Dog.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/FirTree.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/FirTree.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/FirTree.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/FirTree.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Footballer.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Footballer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/Footballer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Footballer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/FootballerPk.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/FootballerPk.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/FootballerPk.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/FootballerPk.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Furniture.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Furniture.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/Furniture.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Furniture.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/GoalKeeper.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/GoalKeeper.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/GoalKeeper.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/GoalKeeper.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Home.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Home.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/Home.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Home.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Location.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Location.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/Location.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Location.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/MilitaryBuilding.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/MilitaryBuilding.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/MilitaryBuilding.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/MilitaryBuilding.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Monkey.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Monkey.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/Monkey.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Monkey.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Phone.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Phone.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/Phone.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Phone.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java
similarity index 94%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java
index 7c6b64b15f..eb0464a4e5 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 package org.hibernate.test.annotations.id.entities;
 
 public enum Planet {
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/PlanetCheatSheet.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/PlanetCheatSheet.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/PlanetCheatSheet.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/PlanetCheatSheet.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/PointyTooth.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/PointyTooth.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/PointyTooth.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/PointyTooth.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Shoe.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Shoe.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/Shoe.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Shoe.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/SoundSystem.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/SoundSystem.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/SoundSystem.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/SoundSystem.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Store.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Store.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/Store.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Store.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Tower.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Tower.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/Tower.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Tower.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Tree.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Tree.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/Tree.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Tree.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/entities/TwinkleToes.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/TwinkleToes.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/entities/TwinkleToes.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/entities/TwinkleToes.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/generationmappings/AutoEntity.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/generationmappings/AutoEntity.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/generationmappings/AutoEntity.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/generationmappings/AutoEntity.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/generationmappings/CompleteSequenceEntity.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/generationmappings/CompleteSequenceEntity.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/generationmappings/CompleteSequenceEntity.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/generationmappings/CompleteSequenceEntity.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/generationmappings/MinimalSequenceEntity.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/generationmappings/MinimalSequenceEntity.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/generationmappings/MinimalSequenceEntity.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/generationmappings/MinimalSequenceEntity.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/generationmappings/MinimalTableEntity.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/generationmappings/MinimalTableEntity.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/generationmappings/MinimalTableEntity.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/generationmappings/MinimalTableEntity.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/package-info.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/package-info.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/package-info.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/package-info.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/EnumIdTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/EnumIdTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/EnumIdTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/EnumIdTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/IdClassTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/IdClassTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/IdClassTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/IdClassTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/JoinColumnOverrideTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/JoinColumnOverrideTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/JoinColumnOverrideTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/JoinColumnOverrideTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/NewSchemeIdTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/NewSchemeIdTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/NewSchemeIdTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/NewSchemeIdTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/UUIDGenerator.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/UUIDGenerator.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/UUIDGenerator.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/UUIDGenerator.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Ball.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Ball.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Ball.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Ball.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/BreakDance.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/BreakDance.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/BreakDance.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/BreakDance.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Bunny.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Bunny.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Bunny.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Bunny.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Computer.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Computer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Computer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Computer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Department.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Department.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Department.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Department.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Dog.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Dog.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Dog.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Dog.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/FirTree.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/FirTree.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/FirTree.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/FirTree.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Footballer.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Footballer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Footballer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Footballer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/FootballerPk.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/FootballerPk.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/FootballerPk.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/FootballerPk.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Furniture.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Furniture.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Furniture.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Furniture.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/GoalKeeper.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/GoalKeeper.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/GoalKeeper.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/GoalKeeper.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Home.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Home.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Home.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Home.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Location.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Location.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Location.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Location.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/MilitaryBuilding.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/MilitaryBuilding.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/MilitaryBuilding.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/MilitaryBuilding.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Monkey.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Monkey.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Monkey.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Monkey.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Phone.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Phone.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Phone.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Phone.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Planet.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Planet.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Planet.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Planet.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/PlanetCheatSheet.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/PlanetCheatSheet.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/PlanetCheatSheet.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/PlanetCheatSheet.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/PointyTooth.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/PointyTooth.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/PointyTooth.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/PointyTooth.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Shoe.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Shoe.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Shoe.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Shoe.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/SoundSystem.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/SoundSystem.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/SoundSystem.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/SoundSystem.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Store.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Store.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Store.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Store.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Tower.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Tower.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Tower.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Tower.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Tree.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Tree.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Tree.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Tree.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/TwinkleToes.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/TwinkleToes.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/entities/TwinkleToes.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/entities/TwinkleToes.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/package-info.java b/testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/package-info.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/id/sequences/package-info.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/id/sequences/package-info.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idclass/DomainAdmin.java b/testsuite/src/test/java/org/hibernate/test/annotations/idclass/DomainAdmin.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idclass/DomainAdmin.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idclass/DomainAdmin.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idclass/DomainAdminId.java b/testsuite/src/test/java/org/hibernate/test/annotations/idclass/DomainAdminId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idclass/DomainAdminId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idclass/DomainAdminId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idclass/IdClassCompositePKTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/idclass/IdClassCompositePKTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idclass/IdClassCompositePKTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idclass/IdClassCompositePKTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.java b/testsuite/src/test/java/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idclass/xml/IdClassXmlTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/idclass/xml/IdClassXmlTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idclass/xml/IdClassXmlTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idclass/xml/IdClassXmlTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/IdClassGeneratedValueTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/IdClassGeneratedValueTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/IdClassGeneratedValueTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/IdClassGeneratedValueTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Multiple.java b/testsuite/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Multiple.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Multiple.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Multiple.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/MultiplePK.java b/testsuite/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/MultiplePK.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/MultiplePK.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/MultiplePK.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple.java b/testsuite/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple2.java b/testsuite/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple2.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple2.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple2.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/SimplePK.java b/testsuite/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/SimplePK.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/SimplePK.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/SimplePK.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/identifiercollection/Passport.java b/testsuite/src/test/java/org/hibernate/test/annotations/identifiercollection/Passport.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/identifiercollection/Passport.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/identifiercollection/Passport.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/identifiercollection/Stamp.java b/testsuite/src/test/java/org/hibernate/test/annotations/identifiercollection/Stamp.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/identifiercollection/Stamp.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/identifiercollection/Stamp.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItems.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItems.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItems.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItems.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItemsPK.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItemsPK.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItemsPK.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItemsPK.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/Card.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/Card.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/Card.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/Card.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/CardField.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/CardField.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/CardField.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/CardField.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/CardKey.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/CardKey.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/CardKey.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/CardKey.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/Customer.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/Customer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/Customer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/Customer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/Customers.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/Customers.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/Customers.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/Customers.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/IdManyToOneTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/IdManyToOneTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/IdManyToOneTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/IdManyToOneTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/Project.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/Project.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/Project.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/Project.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/ShoppingBaskets.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/ShoppingBaskets.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/ShoppingBaskets.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/ShoppingBaskets.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/ShoppingBasketsPK.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/ShoppingBasketsPK.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/ShoppingBasketsPK.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/ShoppingBasketsPK.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/Store.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/Store.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/Store.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/Store.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomer.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomerPK.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomerPK.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomerPK.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomerPK.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/A.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/A.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/A.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/A.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Acces.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Acces.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Acces.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Acces.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalIdManyToOneTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalIdManyToOneTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalIdManyToOneTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalIdManyToOneTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/B.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/B.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/B.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/B.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/BId.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/BId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/BId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/BId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Benefserv.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Benefserv.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Benefserv.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Benefserv.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/C.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/C.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/C.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/C.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/CId.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/CId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/CId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/CId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Droitacces.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Droitacces.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Droitacces.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Droitacces.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Service.java b/testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Service.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Service.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Service.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/immutable/Country.java b/testsuite/src/test/java/org/hibernate/test/annotations/immutable/Country.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/immutable/Country.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/immutable/Country.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/immutable/Foobar.java b/testsuite/src/test/java/org/hibernate/test/annotations/immutable/Foobar.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/immutable/Foobar.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/immutable/Foobar.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/immutable/State.java b/testsuite/src/test/java/org/hibernate/test/annotations/immutable/State.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/immutable/State.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/immutable/State.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/AddressBook.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/AddressBook.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/AddressBook.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/AddressBook.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntry.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntry.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntry.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntry.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntryPk.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntryPk.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntryPk.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntryPk.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/AlphabeticalDirectory.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/AlphabeticalDirectory.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/AlphabeticalDirectory.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/AlphabeticalDirectory.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Atmosphere.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Atmosphere.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Atmosphere.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Atmosphere.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Drawer.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Drawer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Drawer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Drawer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Dress.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Dress.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Dress.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Dress.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Gas.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Gas.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Gas.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Gas.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/GasKey.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/GasKey.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/GasKey.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/GasKey.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Generation.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Generation.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Generation.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Generation.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationGroup.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationGroup.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationGroup.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationGroup.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationUser.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationUser.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationUser.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationUser.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/News.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/News.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/News.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/News.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Newspaper.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Newspaper.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Newspaper.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Newspaper.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Painter.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Painter.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Painter.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Painter.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Painting.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Painting.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Painting.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Painting.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/PaintingPk.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/PaintingPk.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/PaintingPk.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/PaintingPk.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/PressReleaseAgency.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/PressReleaseAgency.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/PressReleaseAgency.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/PressReleaseAgency.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Software.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Software.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Software.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Software.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Trainee.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Trainee.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Trainee.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Trainee.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Training.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Training.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Training.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Training.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Version.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Version.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Version.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Version.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Wardrobe.java b/testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Wardrobe.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/indexcoll/Wardrobe.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Wardrobe.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/Apple.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/Apple.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/Apple.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/Apple.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/Carrot.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/Carrot.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/Carrot.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/Carrot.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/Fruit.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/Fruit.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/Fruit.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/Fruit.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/SubclassTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/SubclassTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/SubclassTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/SubclassTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/Tomato.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/Tomato.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/Tomato.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/Tomato.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/Vegetable.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/Vegetable.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/Vegetable.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/Vegetable.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/VegetablePk.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/VegetablePk.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/VegetablePk.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/VegetablePk.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Account.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Account.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Account.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Account.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Alarm.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Alarm.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Alarm.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Alarm.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Client.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Client.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Client.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Client.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Clothing.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Clothing.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Clothing.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Clothing.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Company.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Company.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Company.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Company.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Customer.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Customer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Customer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Customer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Document.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Document.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Document.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Document.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/EventInformation.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/EventInformation.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/EventInformation.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/EventInformation.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/File.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/File.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/File.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/File.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/FinancialAsset.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/FinancialAsset.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/FinancialAsset.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/FinancialAsset.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Folder.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Folder.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Folder.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Folder.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/LegalEntity.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/LegalEntity.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/LegalEntity.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/LegalEntity.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Parent.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Parent.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Parent.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Parent.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Person.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Person.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Person.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Person.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Pool.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Pool.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Pool.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Pool.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/ProgramExecution.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/ProgramExecution.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/ProgramExecution.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/ProgramExecution.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/PropertyAsset.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/PropertyAsset.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/PropertyAsset.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/PropertyAsset.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Sweater.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Sweater.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Sweater.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/Sweater.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/SwimmingPool.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/SwimmingPool.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/SwimmingPool.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/SwimmingPool.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/SymbolicLink.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/SymbolicLink.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/SymbolicLink.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/joined/SymbolicLink.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/mixed/Document.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/mixed/Document.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/mixed/Document.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/mixed/Document.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/mixed/File.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/mixed/File.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/mixed/File.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/mixed/File.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/mixed/Folder.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/mixed/Folder.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/mixed/Folder.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/mixed/Folder.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/mixed/SubclassTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/mixed/SubclassTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/mixed/SubclassTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/mixed/SubclassTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/mixed/SymbolicLink.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/mixed/SymbolicLink.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/mixed/SymbolicLink.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/mixed/SymbolicLink.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Building.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Building.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Building.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Building.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Funk.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Funk.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Funk.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Funk.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/singletable/House.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/singletable/House.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/singletable/House.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/singletable/House.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Music.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Music.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Music.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Music.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Noise.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Noise.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Noise.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Noise.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/singletable/PaperTrash.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/singletable/PaperTrash.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/singletable/PaperTrash.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/singletable/PaperTrash.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Rock.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Rock.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Rock.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Rock.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Trash.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Trash.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Trash.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Trash.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/union/Document.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/union/Document.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/union/Document.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/union/Document.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/union/File.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/union/File.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/union/File.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/union/File.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/union/Folder.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/union/Folder.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/union/Folder.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/union/Folder.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/union/SubclassTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/union/SubclassTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/union/SubclassTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/union/SubclassTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/inheritance/union/SymbolicLink.java b/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/union/SymbolicLink.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/inheritance/union/SymbolicLink.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/inheritance/union/SymbolicLink.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/interfaces/Contact.java b/testsuite/src/test/java/org/hibernate/test/annotations/interfaces/Contact.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/interfaces/Contact.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/interfaces/Contact.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/interfaces/ContactImpl.java b/testsuite/src/test/java/org/hibernate/test/annotations/interfaces/ContactImpl.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/interfaces/ContactImpl.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/interfaces/ContactImpl.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/interfaces/InterfacesTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/interfaces/InterfacesTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/interfaces/InterfacesTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/interfaces/InterfacesTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/interfaces/User.java b/testsuite/src/test/java/org/hibernate/test/annotations/interfaces/User.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/interfaces/User.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/interfaces/User.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/interfaces/UserImpl.java b/testsuite/src/test/java/org/hibernate/test/annotations/interfaces/UserImpl.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/interfaces/UserImpl.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/interfaces/UserImpl.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/join/A.java b/testsuite/src/test/java/org/hibernate/test/annotations/join/A.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/join/A.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/join/A.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/join/B.java b/testsuite/src/test/java/org/hibernate/test/annotations/join/B.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/join/B.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/join/B.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/join/C.java b/testsuite/src/test/java/org/hibernate/test/annotations/join/C.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/join/C.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/join/C.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/join/Cat.java b/testsuite/src/test/java/org/hibernate/test/annotations/join/Cat.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/join/Cat.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/join/Cat.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/join/Death.java b/testsuite/src/test/java/org/hibernate/test/annotations/join/Death.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/join/Death.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/join/Death.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/join/Dog.java b/testsuite/src/test/java/org/hibernate/test/annotations/join/Dog.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/join/Dog.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/join/Dog.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/join/DogPk.java b/testsuite/src/test/java/org/hibernate/test/annotations/join/DogPk.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/join/DogPk.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/join/DogPk.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/join/JoinTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/join/JoinTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/join/JoinTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/join/JoinTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/join/Life.java b/testsuite/src/test/java/org/hibernate/test/annotations/join/Life.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/join/Life.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/join/Life.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/join/SysGroupsOrm.java b/testsuite/src/test/java/org/hibernate/test/annotations/join/SysGroupsOrm.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/join/SysGroupsOrm.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/join/SysGroupsOrm.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/join/SysUserOrm.java b/testsuite/src/test/java/org/hibernate/test/annotations/join/SysUserOrm.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/join/SysUserOrm.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/join/SysUserOrm.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/loader/Player.java b/testsuite/src/test/java/org/hibernate/test/annotations/loader/Player.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/loader/Player.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/loader/Player.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/loader/Team.java b/testsuite/src/test/java/org/hibernate/test/annotations/loader/Team.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/loader/Team.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/loader/Team.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/lob/Book.java b/testsuite/src/test/java/org/hibernate/test/annotations/lob/Book.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/lob/Book.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/lob/Book.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/lob/CharacterArrayTextType.java b/testsuite/src/test/java/org/hibernate/test/annotations/lob/CharacterArrayTextType.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/lob/CharacterArrayTextType.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/lob/CharacterArrayTextType.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/lob/CompiledCode.java b/testsuite/src/test/java/org/hibernate/test/annotations/lob/CompiledCode.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/lob/CompiledCode.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/lob/CompiledCode.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/lob/Dog.java b/testsuite/src/test/java/org/hibernate/test/annotations/lob/Dog.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/lob/Dog.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/lob/Dog.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/lob/Editor.java b/testsuite/src/test/java/org/hibernate/test/annotations/lob/Editor.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/lob/Editor.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/lob/Editor.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/lob/ImageHolder.java b/testsuite/src/test/java/org/hibernate/test/annotations/lob/ImageHolder.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/lob/ImageHolder.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/lob/ImageHolder.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/lob/ImageTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/lob/ImageTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/lob/ImageTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/lob/ImageTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/lob/LobTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/lob/LobTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/lob/LobTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/lob/LobTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/lob/LongStringHolder.java b/testsuite/src/test/java/org/hibernate/test/annotations/lob/LongStringHolder.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/lob/LongStringHolder.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/lob/LongStringHolder.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/lob/PrimitiveCharacterArrayTextType.java b/testsuite/src/test/java/org/hibernate/test/annotations/lob/PrimitiveCharacterArrayTextType.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/lob/PrimitiveCharacterArrayTextType.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/lob/PrimitiveCharacterArrayTextType.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/lob/SerializableToImageType.java b/testsuite/src/test/java/org/hibernate/test/annotations/lob/SerializableToImageType.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/lob/SerializableToImageType.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/lob/SerializableToImageType.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/lob/TextTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/lob/TextTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/lob/TextTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/lob/TextTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/lob/WrappedImageType.java b/testsuite/src/test/java/org/hibernate/test/annotations/lob/WrappedImageType.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/lob/WrappedImageType.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/lob/WrappedImageType.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/lob/package-info.java b/testsuite/src/test/java/org/hibernate/test/annotations/lob/package-info.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/lob/package-info.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/lob/package-info.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Building.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Building.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/Building.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Building.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/BuildingCompany.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/BuildingCompany.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/BuildingCompany.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/BuildingCompany.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Cat.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Cat.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/Cat.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Cat.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/CatPk.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/CatPk.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/CatPk.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/CatPk.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/City.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/City.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/City.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/City.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Company.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Company.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/Company.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Company.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ContactInfo.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/ContactInfo.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/ContactInfo.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/ContactInfo.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Contractor.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Contractor.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/Contractor.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Contractor.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Employee.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Employee.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/Employee.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Employee.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Employer.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Employer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/Employer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Employer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Friend.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Friend.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/Friend.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Friend.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Group.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Group.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/Group.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Group.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Inspector.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Inspector.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/Inspector.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Inspector.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/InspectorPrefixes.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/InspectorPrefixes.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/InspectorPrefixes.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/InspectorPrefixes.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/JobInfo.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/JobInfo.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/JobInfo.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/JobInfo.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/KnownClient.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/KnownClient.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/KnownClient.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/KnownClient.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Man.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Man.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/Man.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Man.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ManPk.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/ManPk.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/ManPk.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/ManPk.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyMaxFetchDepth0Test.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyMaxFetchDepth0Test.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyMaxFetchDepth0Test.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyMaxFetchDepth0Test.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Permission.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Permission.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/Permission.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Permission.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/PhoneNumber.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/PhoneNumber.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/PhoneNumber.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/PhoneNumber.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ProgramManager.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/ProgramManager.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/ProgramManager.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/ProgramManager.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Store.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Store.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/Store.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Store.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Supplier.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Supplier.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/Supplier.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Supplier.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Woman.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Woman.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/Woman.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Woman.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/WomanPk.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/WomanPk.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/WomanPk.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/WomanPk.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Zone.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Zone.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytomany/Zone.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytomany/Zone.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/BiggestForest.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/BiggestForest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/BiggestForest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/BiggestForest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/Car.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Car.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/Car.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Car.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/Carz.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Carz.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/Carz.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Carz.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/Child.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Child.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/Child.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Child.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/Color.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Color.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/Color.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Color.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/Customer.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Customer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/Customer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Customer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/Deal.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Deal.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/Deal.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Deal.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/DistrictUser.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/DistrictUser.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/DistrictUser.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/DistrictUser.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/ForestType.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/ForestType.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/ForestType.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/ForestType.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/Frame.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Frame.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/Frame.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Frame.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/Lens.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Lens.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/Lens.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Lens.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/Lotz.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Lotz.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/Lotz.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Lotz.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/LotzPK.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/LotzPK.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/LotzPK.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/LotzPK.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/Node.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Node.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/Node.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Node.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/NodePk.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/NodePk.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/NodePk.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/NodePk.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/Order.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Order.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/Order.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Order.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/OrderLine.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/OrderLine.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/OrderLine.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/OrderLine.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/Parent.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Parent.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/Parent.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/Parent.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/ParentPk.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/ParentPk.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/ParentPk.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/ParentPk.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/TreeType.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/TreeType.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/TreeType.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/TreeType.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/User.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/User.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/User.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/User.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/UserPK.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/UserPK.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/UserPK.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/UserPK.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/GenericObject.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/GenericObject.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/GenericObject.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/GenericObject.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Item.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Item.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Item.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Item.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Vendor.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Vendor.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Vendor.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Vendor.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ZItemCost.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ZItemCost.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ZItemCost.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ZItemCost.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Company.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Company.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Company.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Company.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Contract.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Contract.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Contract.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Contract.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ContractId.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ContractId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ContractId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ContractId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/FoodItem.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/FoodItem.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/FoodItem.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/FoodItem.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Language.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Language.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Language.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Language.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Manufacturer.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Manufacturer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Manufacturer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Manufacturer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManufacturerId.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManufacturerId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManufacturerId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManufacturerId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Menu.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Menu.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Menu.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Menu.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Message.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Message.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Message.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Message.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Model.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Model.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Model.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Model.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ModelId.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ModelId.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ModelId.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ModelId.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Person.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Person.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Person.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Person.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Product.java b/testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Product.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Product.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Product.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/Account.java b/testsuite/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/Account.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/Account.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/Account.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/AccountBase.java b/testsuite/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/AccountBase.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/AccountBase.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/AccountBase.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/IntermediateMappedSuperclassTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/IntermediateMappedSuperclassTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/IntermediateMappedSuperclassTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/IntermediateMappedSuperclassTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/SavingsAccount.java b/testsuite/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/SavingsAccount.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/SavingsAccount.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/SavingsAccount.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/SavingsAccountBase.java b/testsuite/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/SavingsAccountBase.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/SavingsAccountBase.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/SavingsAccountBase.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/A.java b/testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/A.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/A.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/A.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java b/testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java
similarity index 98%
rename from annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java
index e9b7eeb0dd..9172c00de5 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 package org.hibernate.test.annotations.namingstrategy;
 
 import javax.persistence.Entity;
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/AddressEntry.java b/testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/AddressEntry.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/AddressEntry.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/AddressEntry.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java b/testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java
similarity index 96%
rename from annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java
index 1d4157329e..2ff11dc4ce 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 package org.hibernate.test.annotations.namingstrategy;
 
 import org.hibernate.cfg.EJB3NamingStrategy;
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java b/testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java
similarity index 98%
rename from annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java
index 4621595782..27c59f61ae 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 package org.hibernate.test.annotations.namingstrategy;
 
 import java.util.HashSet;
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/naturalid/Citizen.java b/testsuite/src/test/java/org/hibernate/test/annotations/naturalid/Citizen.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/naturalid/Citizen.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/naturalid/Citizen.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnManyToOne.java b/testsuite/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnManyToOne.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnManyToOne.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnManyToOne.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/naturalid/State.java b/testsuite/src/test/java/org/hibernate/test/annotations/naturalid/State.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/naturalid/State.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/naturalid/State.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/notfound/Coin.java b/testsuite/src/test/java/org/hibernate/test/annotations/notfound/Coin.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/notfound/Coin.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/notfound/Coin.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/notfound/Currency.java b/testsuite/src/test/java/org/hibernate/test/annotations/notfound/Currency.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/notfound/Currency.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/notfound/Currency.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/notfound/NotFoundTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/notfound/NotFoundTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/notfound/NotFoundTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/notfound/NotFoundTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Child.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Child.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/Child.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Child.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/City.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/City.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/City.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/City.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Manufacturer.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Manufacturer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/Manufacturer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Manufacturer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Model.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Model.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/Model.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Model.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Monkey.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Monkey.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/Monkey.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Monkey.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Order.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Order.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/Order.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Order.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/OrderID.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/OrderID.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/OrderID.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/OrderID.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/OrderItem.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/OrderItem.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/OrderItem.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/OrderItem.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/OrderItemID.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/OrderItemID.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/OrderItemID.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/OrderItemID.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Organisation.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Organisation.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/Organisation.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Organisation.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/OrganisationUser.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/OrganisationUser.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/OrganisationUser.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/OrganisationUser.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Parent.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Parent.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/Parent.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Parent.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/ParentPk.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/ParentPk.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/ParentPk.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/ParentPk.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Person.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Person.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/Person.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Person.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/PoliticalParty.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/PoliticalParty.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/PoliticalParty.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/PoliticalParty.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Politician.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Politician.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/Politician.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Politician.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Soldier.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Soldier.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/Soldier.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Soldier.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Street.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Street.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/Street.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Street.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Tiger.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Tiger.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/Tiger.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Tiger.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Trainer.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Trainer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/Trainer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Trainer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Troop.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Troop.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetomany/Troop.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetomany/Troop.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/Address.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Address.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/Address.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Address.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/Body.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Body.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/Body.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Body.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/Client.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Client.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/Client.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Client.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/Computer.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Computer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/Computer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Computer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/ComputerPk.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/ComputerPk.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/ComputerPk.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/ComputerPk.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/Father.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Father.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/Father.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Father.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/Heart.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Heart.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/Heart.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Heart.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/Owner.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Owner.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/Owner.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Owner.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/Party.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Party.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/Party.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Party.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/PartyAffiliate.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/PartyAffiliate.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/PartyAffiliate.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/PartyAffiliate.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumber.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumber.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumber.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumber.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumberPk.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumberPk.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumberPk.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumberPk.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/Show.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Show.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/Show.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Show.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/ShowDescription.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/ShowDescription.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/ShowDescription.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/ShowDescription.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/Son.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Son.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/Son.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Son.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/Trousers.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Trousers.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/Trousers.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/Trousers.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/TrousersZip.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/TrousersZip.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/TrousersZip.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/TrousersZip.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/BaseEntity.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/BaseEntity.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/BaseEntity.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/BaseEntity.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Device.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Device.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Device.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Device.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/HHH4851Test.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/HHH4851Test.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/HHH4851Test.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/HHH4851Test.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/ManagedDevice.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/ManagedDevice.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/ManagedDevice.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/ManagedDevice.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Owner.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Owner.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Owner.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Owner.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/Address.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/Address.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/Address.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/Address.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/NullablePrimaryKeyTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/NullablePrimaryKeyTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/NullablePrimaryKeyTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/NullablePrimaryKeyTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/Person.java b/testsuite/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/Person.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/Person.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/Person.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/override/Addr.java b/testsuite/src/test/java/org/hibernate/test/annotations/override/Addr.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/override/Addr.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/override/Addr.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/override/Address.java b/testsuite/src/test/java/org/hibernate/test/annotations/override/Address.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/override/Address.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/override/Address.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/override/AssociationOverrideTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/override/AssociationOverrideTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/override/AssociationOverrideTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/override/AssociationOverrideTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/override/AttributeOverrideTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/override/AttributeOverrideTest.java
similarity index 84%
rename from annotations/src/test/java/org/hibernate/test/annotations/override/AttributeOverrideTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/override/AttributeOverrideTest.java
index d8c1a6bf7d..324bae15b3 100644
--- a/annotations/src/test/java/org/hibernate/test/annotations/override/AttributeOverrideTest.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/override/AttributeOverrideTest.java
@@ -1,14 +1,7 @@
 package org.hibernate.test.annotations.override;
 
-import java.util.Iterator;
-
 import org.hibernate.test.annotations.TestCase;
 import org.hibernate.test.util.SchemaUtil;
-import org.hibernate.metadata.CollectionMetadata;
-import org.hibernate.engine.SessionFactoryImplementor;
-import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.mapping.Table;
-import org.hibernate.mapping.Column;
 
 /**
  * @author Emmanuel Bernard
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/override/ContactInfo.java b/testsuite/src/test/java/org/hibernate/test/annotations/override/ContactInfo.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/override/ContactInfo.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/override/ContactInfo.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/override/Employee.java b/testsuite/src/test/java/org/hibernate/test/annotations/override/Employee.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/override/Employee.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/override/Employee.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/override/Location.java b/testsuite/src/test/java/org/hibernate/test/annotations/override/Location.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/override/Location.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/override/Location.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/override/Move.java b/testsuite/src/test/java/org/hibernate/test/annotations/override/Move.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/override/Move.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/override/Move.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/override/PhoneNumber.java b/testsuite/src/test/java/org/hibernate/test/annotations/override/PhoneNumber.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/override/PhoneNumber.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/override/PhoneNumber.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/override/PropertyInfo.java b/testsuite/src/test/java/org/hibernate/test/annotations/override/PropertyInfo.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/override/PropertyInfo.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/override/PropertyInfo.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/override/PropertyRecord.java b/testsuite/src/test/java/org/hibernate/test/annotations/override/PropertyRecord.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/override/PropertyRecord.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/override/PropertyRecord.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/override/SocialSite.java b/testsuite/src/test/java/org/hibernate/test/annotations/override/SocialSite.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/override/SocialSite.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/override/SocialSite.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/override/SocialTouchPoints.java b/testsuite/src/test/java/org/hibernate/test/annotations/override/SocialTouchPoints.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/override/SocialTouchPoints.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/override/SocialTouchPoints.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/override/Trip.java b/testsuite/src/test/java/org/hibernate/test/annotations/override/Trip.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/override/Trip.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/override/Trip.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/persister/Card.java b/testsuite/src/test/java/org/hibernate/test/annotations/persister/Card.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/persister/Card.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/persister/Card.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/persister/CollectionPersister.java b/testsuite/src/test/java/org/hibernate/test/annotations/persister/CollectionPersister.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/persister/CollectionPersister.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/persister/CollectionPersister.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/persister/Deck.java b/testsuite/src/test/java/org/hibernate/test/annotations/persister/Deck.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/persister/Deck.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/persister/Deck.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/persister/EntityPersister.java b/testsuite/src/test/java/org/hibernate/test/annotations/persister/EntityPersister.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/persister/EntityPersister.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/persister/EntityPersister.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/persister/PersisterTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/persister/PersisterTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/persister/PersisterTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/persister/PersisterTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/polymorphism/Car.java b/testsuite/src/test/java/org/hibernate/test/annotations/polymorphism/Car.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/polymorphism/Car.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/polymorphism/Car.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/polymorphism/MovingThing.java b/testsuite/src/test/java/org/hibernate/test/annotations/polymorphism/MovingThing.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/polymorphism/MovingThing.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/polymorphism/MovingThing.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/polymorphism/SportCar.java b/testsuite/src/test/java/org/hibernate/test/annotations/polymorphism/SportCar.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/polymorphism/SportCar.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/polymorphism/SportCar.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/query/Area.java b/testsuite/src/test/java/org/hibernate/test/annotations/query/Area.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/query/Area.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/query/Area.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/query/Captain.java b/testsuite/src/test/java/org/hibernate/test/annotations/query/Captain.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/query/Captain.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/query/Captain.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/query/CasimirParticle.java b/testsuite/src/test/java/org/hibernate/test/annotations/query/CasimirParticle.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/query/CasimirParticle.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/query/CasimirParticle.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/query/Chaos.java b/testsuite/src/test/java/org/hibernate/test/annotations/query/Chaos.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/query/Chaos.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/query/Chaos.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/query/Darkness.java b/testsuite/src/test/java/org/hibernate/test/annotations/query/Darkness.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/query/Darkness.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/query/Darkness.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/query/Dictionary.java b/testsuite/src/test/java/org/hibernate/test/annotations/query/Dictionary.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/query/Dictionary.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/query/Dictionary.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/query/Dimensions.java b/testsuite/src/test/java/org/hibernate/test/annotations/query/Dimensions.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/query/Dimensions.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/query/Dimensions.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/query/Identity.java b/testsuite/src/test/java/org/hibernate/test/annotations/query/Identity.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/query/Identity.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/query/Identity.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/query/Mark.java b/testsuite/src/test/java/org/hibernate/test/annotations/query/Mark.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/query/Mark.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/query/Mark.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/query/Night.java b/testsuite/src/test/java/org/hibernate/test/annotations/query/Night.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/query/Night.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/query/Night.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/query/SpaceShip.java b/testsuite/src/test/java/org/hibernate/test/annotations/query/SpaceShip.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/query/SpaceShip.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/query/SpaceShip.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/query/SynonymousDictionary.java b/testsuite/src/test/java/org/hibernate/test/annotations/query/SynonymousDictionary.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/query/SynonymousDictionary.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/query/SynonymousDictionary.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/query/Twilight.java b/testsuite/src/test/java/org/hibernate/test/annotations/query/Twilight.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/query/Twilight.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/query/Twilight.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/quote/Phone.java b/testsuite/src/test/java/org/hibernate/test/annotations/quote/Phone.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/quote/Phone.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/quote/Phone.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/quote/QuoteGlobalTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/quote/QuoteGlobalTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/quote/QuoteGlobalTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/quote/QuoteGlobalTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/quote/Role.java b/testsuite/src/test/java/org/hibernate/test/annotations/quote/Role.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/quote/Role.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/quote/Role.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/quote/User.java b/testsuite/src/test/java/org/hibernate/test/annotations/quote/User.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/quote/User.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/quote/User.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/MyEntity.java b/testsuite/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/MyEntity.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/MyEntity.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/MyEntity.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Bag.java b/testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Bag.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Bag.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Bag.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Clothes.java b/testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Clothes.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Clothes.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Clothes.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/House.java b/testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/House.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/House.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/House.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Inhabitant.java b/testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Inhabitant.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Inhabitant.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Inhabitant.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Item.java b/testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Item.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Item.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Item.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ItemCost.java b/testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ItemCost.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ItemCost.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ItemCost.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Luggage.java b/testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Luggage.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Luggage.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Luggage.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Postman.java b/testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Postman.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Postman.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Postman.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Rambler.java b/testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Rambler.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Rambler.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Rambler.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Vendor.java b/testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Vendor.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Vendor.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Vendor.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/WarehouseItem.java b/testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/WarehouseItem.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/referencedcolumnname/WarehouseItem.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/referencedcolumnname/WarehouseItem.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/reflection/Administration.java b/testsuite/src/test/java/org/hibernate/test/annotations/reflection/Administration.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/reflection/Administration.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/reflection/Administration.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/reflection/Availability.java b/testsuite/src/test/java/org/hibernate/test/annotations/reflection/Availability.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/reflection/Availability.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/reflection/Availability.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/reflection/BusTrip.java b/testsuite/src/test/java/org/hibernate/test/annotations/reflection/BusTrip.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/reflection/BusTrip.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/reflection/BusTrip.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/reflection/BusTripPk.java b/testsuite/src/test/java/org/hibernate/test/annotations/reflection/BusTripPk.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/reflection/BusTripPk.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/reflection/BusTripPk.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/reflection/Competition.java b/testsuite/src/test/java/org/hibernate/test/annotations/reflection/Competition.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/reflection/Competition.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/reflection/Competition.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/reflection/LogListener.java b/testsuite/src/test/java/org/hibernate/test/annotations/reflection/LogListener.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/reflection/LogListener.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/reflection/LogListener.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/reflection/Match.java b/testsuite/src/test/java/org/hibernate/test/annotations/reflection/Match.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/reflection/Match.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/reflection/Match.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/reflection/Organization.java b/testsuite/src/test/java/org/hibernate/test/annotations/reflection/Organization.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/reflection/Organization.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/reflection/Organization.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/reflection/OtherLogListener.java b/testsuite/src/test/java/org/hibernate/test/annotations/reflection/OtherLogListener.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/reflection/OtherLogListener.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/reflection/OtherLogListener.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityMoralAccount.java b/testsuite/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityMoralAccount.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityMoralAccount.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityMoralAccount.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java b/testsuite/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityPhysicalAccount.java b/testsuite/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityPhysicalAccount.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityPhysicalAccount.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityPhysicalAccount.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/reflection/TennisMatch.java b/testsuite/src/test/java/org/hibernate/test/annotations/reflection/TennisMatch.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/reflection/TennisMatch.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/reflection/TennisMatch.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/strategy/Location.java b/testsuite/src/test/java/org/hibernate/test/annotations/strategy/Location.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/strategy/Location.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/strategy/Location.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/strategy/Storm.java b/testsuite/src/test/java/org/hibernate/test/annotations/strategy/Storm.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/strategy/Storm.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/strategy/Storm.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/strategy/StrategyTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/strategy/StrategyTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/strategy/StrategyTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/strategy/StrategyTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/subselect/Bid.java b/testsuite/src/test/java/org/hibernate/test/annotations/subselect/Bid.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/subselect/Bid.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/subselect/Bid.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/subselect/HighestBid.java b/testsuite/src/test/java/org/hibernate/test/annotations/subselect/HighestBid.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/subselect/HighestBid.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/subselect/HighestBid.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/subselect/Item.java b/testsuite/src/test/java/org/hibernate/test/annotations/subselect/Item.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/subselect/Item.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/subselect/Item.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/subselect/SubselectTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/subselect/SubselectTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/subselect/SubselectTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/subselect/SubselectTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/tableperclass/Component.java b/testsuite/src/test/java/org/hibernate/test/annotations/tableperclass/Component.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/tableperclass/Component.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/tableperclass/Component.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/tableperclass/Machine.java b/testsuite/src/test/java/org/hibernate/test/annotations/tableperclass/Machine.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/tableperclass/Machine.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/tableperclass/Machine.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/tableperclass/Product.java b/testsuite/src/test/java/org/hibernate/test/annotations/tableperclass/Product.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/tableperclass/Product.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/tableperclass/Product.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/tableperclass/Robot.java b/testsuite/src/test/java/org/hibernate/test/annotations/tableperclass/Robot.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/tableperclass/Robot.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/tableperclass/Robot.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/tableperclass/T800.java b/testsuite/src/test/java/org/hibernate/test/annotations/tableperclass/T800.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/tableperclass/T800.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/tableperclass/T800.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/target/Brand.java b/testsuite/src/test/java/org/hibernate/test/annotations/target/Brand.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/target/Brand.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/target/Brand.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/target/Luggage.java b/testsuite/src/test/java/org/hibernate/test/annotations/target/Luggage.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/target/Luggage.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/target/Luggage.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/target/LuggageImpl.java b/testsuite/src/test/java/org/hibernate/test/annotations/target/LuggageImpl.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/target/LuggageImpl.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/target/LuggageImpl.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/target/Owner.java b/testsuite/src/test/java/org/hibernate/test/annotations/target/Owner.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/target/Owner.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/target/Owner.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/target/OwnerImpl.java b/testsuite/src/test/java/org/hibernate/test/annotations/target/OwnerImpl.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/target/OwnerImpl.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/target/OwnerImpl.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/target/Size.java b/testsuite/src/test/java/org/hibernate/test/annotations/target/Size.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/target/Size.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/target/Size.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/target/SizeImpl.java b/testsuite/src/test/java/org/hibernate/test/annotations/target/SizeImpl.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/target/SizeImpl.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/target/SizeImpl.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/target/TargetTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/target/TargetTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/target/TargetTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/target/TargetTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/tuplizer/Country.java b/testsuite/src/test/java/org/hibernate/test/annotations/tuplizer/Country.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/tuplizer/Country.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/tuplizer/Country.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/tuplizer/Cuisine.java b/testsuite/src/test/java/org/hibernate/test/annotations/tuplizer/Cuisine.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/tuplizer/Cuisine.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/tuplizer/Cuisine.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/tuplizer/DataProxyHandler.java b/testsuite/src/test/java/org/hibernate/test/annotations/tuplizer/DataProxyHandler.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/tuplizer/DataProxyHandler.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/tuplizer/DataProxyHandler.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicComponentTuplizer.java b/testsuite/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicComponentTuplizer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicComponentTuplizer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicComponentTuplizer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicEntityTuplizer.java b/testsuite/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicEntityTuplizer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicEntityTuplizer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicEntityTuplizer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicInstantiator.java b/testsuite/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicInstantiator.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicInstantiator.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicInstantiator.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/tuplizer/EntityNameInterceptor.java b/testsuite/src/test/java/org/hibernate/test/annotations/tuplizer/EntityNameInterceptor.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/tuplizer/EntityNameInterceptor.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/tuplizer/EntityNameInterceptor.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/tuplizer/ProxyHelper.java b/testsuite/src/test/java/org/hibernate/test/annotations/tuplizer/ProxyHelper.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/tuplizer/ProxyHelper.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/tuplizer/ProxyHelper.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/type/Dvd.java b/testsuite/src/test/java/org/hibernate/test/annotations/type/Dvd.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/type/Dvd.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/type/Dvd.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/type/MyOid.java b/testsuite/src/test/java/org/hibernate/test/annotations/type/MyOid.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/type/MyOid.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/type/MyOid.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/type/MyOidGenerator.java b/testsuite/src/test/java/org/hibernate/test/annotations/type/MyOidGenerator.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/type/MyOidGenerator.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/type/MyOidGenerator.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/type/MyOidType.java b/testsuite/src/test/java/org/hibernate/test/annotations/type/MyOidType.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/type/MyOidType.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/type/MyOidType.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/type/TypeTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/type/TypeTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/type/TypeTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/type/TypeTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/various/Antenna.java b/testsuite/src/test/java/org/hibernate/test/annotations/various/Antenna.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/various/Antenna.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/various/Antenna.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/various/Conductor.java b/testsuite/src/test/java/org/hibernate/test/annotations/various/Conductor.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/various/Conductor.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/various/Conductor.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/various/IndexTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/various/IndexTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/various/IndexTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/various/IndexTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/various/ProfessionalAgreement.java b/testsuite/src/test/java/org/hibernate/test/annotations/various/ProfessionalAgreement.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/various/ProfessionalAgreement.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/various/ProfessionalAgreement.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/various/Truck.java b/testsuite/src/test/java/org/hibernate/test/annotations/various/Truck.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/various/Truck.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/various/Truck.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/various/Vehicule.java b/testsuite/src/test/java/org/hibernate/test/annotations/various/Vehicule.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/various/Vehicule.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/various/Vehicule.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/various/VersionTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/various/VersionTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/various/VersionTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/various/VersionTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/CarModel.java b/testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/CarModel.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/CarModel.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/CarModel.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/Light.java b/testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Light.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/Light.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Light.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/Lighter.java b/testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Lighter.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/Lighter.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Lighter.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java b/testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/Model.java b/testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Model.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/Model.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Model.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/A.java b/testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/A.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/A.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/A.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/AImpl.java b/testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/AImpl.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/AImpl.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/AImpl.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/B.java b/testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/B.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/B.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/B.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/BImpl.java b/testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/BImpl.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/BImpl.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/BImpl.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/CloudType.java b/testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/CloudType.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/CloudType.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/CloudType.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/Government.java b/testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/Government.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/Government.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/Government.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/PrimeMinister.java b/testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/PrimeMinister.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/PrimeMinister.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/PrimeMinister.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/Sky.java b/testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/Sky.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/Sky.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/Sky.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/Z.java b/testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/Z.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/Z.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/Z.java
diff --git a/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/ZImpl.java b/testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/ZImpl.java
similarity index 100%
rename from annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/ZImpl.java
rename to testsuite/src/test/java/org/hibernate/test/annotations/xml/hbm/ZImpl.java
diff --git a/annotations/src/test/java/org/hibernate/test/util/SchemaUtil.java b/testsuite/src/test/java/org/hibernate/test/util/SchemaUtil.java
similarity index 52%
rename from annotations/src/test/java/org/hibernate/test/util/SchemaUtil.java
rename to testsuite/src/test/java/org/hibernate/test/util/SchemaUtil.java
index e14c09673d..e29d5d5784 100644
--- a/annotations/src/test/java/org/hibernate/test/util/SchemaUtil.java
+++ b/testsuite/src/test/java/org/hibernate/test/util/SchemaUtil.java
@@ -1,3 +1,26 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
 package org.hibernate.test.util;
 
 import java.util.Iterator;
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Boy.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Boy.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Boy.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Boy.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Cook.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Cook.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Cook.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Cook.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Crew.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Crew.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Crew.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Crew.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/RentalCar.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/RentalCar.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/access/xml/RentalCar.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/RentalCar.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist2.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist2.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist2.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist2.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist3.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist3.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist3.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist3.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist4.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist4.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist4.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist4.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/fetchprofile/mappings.hbm.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/fetchprofile/mappings.hbm.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/fetchprofile/mappings.hbm.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/fetchprofile/mappings.hbm.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/onetomany/orm.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/onetomany/orm.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/onetomany/orm.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/onetomany/orm.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/onetoone/orm.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/onetoone/orm.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/onetoone/orm.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/onetoone/orm.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/orm.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/orm.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/orm.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/orm.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/query/orm.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/query/orm.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/query/orm.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/query/orm.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml
diff --git a/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml b/testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml
similarity index 100%
rename from annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml
rename to testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml