diff --git a/core-tiger/src/test/java/org/acegisecurity/annotation/MethodDefinitionSourceEditorTigerTests.java b/core-tiger/src/test/java/org/acegisecurity/annotation/MethodDefinitionSourceEditorTigerTests.java
index d75413d9dd..4888b06b1d 100644
--- a/core-tiger/src/test/java/org/acegisecurity/annotation/MethodDefinitionSourceEditorTigerTests.java
+++ b/core-tiger/src/test/java/org/acegisecurity/annotation/MethodDefinitionSourceEditorTigerTests.java
@@ -21,13 +21,13 @@ import java.lang.reflect.Method;
 import junit.framework.TestCase;
 
 import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.Entity;
-import org.acegisecurity.OrganisationService;
-import org.acegisecurity.PersonService;
-import org.acegisecurity.PersonServiceImpl;
 import org.acegisecurity.SecurityConfig;
-import org.acegisecurity.Service;
-import org.acegisecurity.ServiceImpl;
+import org.acegisecurity.annotation.test.Entity;
+import org.acegisecurity.annotation.test.OrganisationService;
+import org.acegisecurity.annotation.test.PersonService;
+import org.acegisecurity.annotation.test.PersonServiceImpl;
+import org.acegisecurity.annotation.test.Service;
+import org.acegisecurity.annotation.test.ServiceImpl;
 import org.acegisecurity.intercept.method.MethodDefinitionMap;
 import org.acegisecurity.intercept.method.MethodDefinitionSourceEditor;
 import org.aopalliance.intercept.MethodInvocation;
@@ -64,7 +64,7 @@ public class MethodDefinitionSourceEditorTigerTests extends TestCase {
         throws Exception {
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
         editor.setAsText(
-            "org.acegisecurity.Service.makeLower*=ROLE_FROM_INTERFACE\r\norg.acegisecurity.Service.makeUpper*=ROLE_FROM_INTERFACE\r\norg.acegisecurity.ServiceImpl.makeUpper*=ROLE_FROM_IMPLEMENTATION");
+            "org.acegisecurity.annotation.test.Service.makeLower*=ROLE_FROM_INTERFACE\r\norg.acegisecurity.annotation.test.Service.makeUpper*=ROLE_FROM_INTERFACE\r\norg.acegisecurity.annotation.test.ServiceImpl.makeUpper*=ROLE_FROM_IMPLEMENTATION");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
         assertEquals(3, map.getMethodMapSize());
@@ -87,7 +87,7 @@ public class MethodDefinitionSourceEditorTigerTests extends TestCase {
         throws Exception {
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
         editor.setAsText(
-            "org.acegisecurity.Service.makeLower*=ROLE_FROM_INTERFACE\r\norg.acegisecurity.Service.makeUpper*=ROLE_FROM_INTERFACE\r\norg.acegisecurity.ServiceImpl.makeUpper*=ROLE_FROM_IMPLEMENTATION");
+            "org.acegisecurity.annotation.test.Service.makeLower*=ROLE_FROM_INTERFACE\r\norg.acegisecurity.annotation.test.Service.makeUpper*=ROLE_FROM_INTERFACE\r\norg.acegisecurity.annotation.test.ServiceImpl.makeUpper*=ROLE_FROM_IMPLEMENTATION");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
         assertEquals(3, map.getMethodMapSize());
diff --git a/core-tiger/src/test/java/org/acegisecurity/Entity.java b/core-tiger/src/test/java/org/acegisecurity/annotation/test/Entity.java
similarity index 97%
rename from core-tiger/src/test/java/org/acegisecurity/Entity.java
rename to core-tiger/src/test/java/org/acegisecurity/annotation/test/Entity.java
index d3ae9c482d..1f8af33e11 100644
--- a/core-tiger/src/test/java/org/acegisecurity/Entity.java
+++ b/core-tiger/src/test/java/org/acegisecurity/annotation/test/Entity.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.acegisecurity.annotation.test;
 
 import org.springframework.util.Assert;
 
diff --git a/core-tiger/src/test/java/org/acegisecurity/Organisation.java b/core-tiger/src/test/java/org/acegisecurity/annotation/test/Organisation.java
similarity index 96%
rename from core-tiger/src/test/java/org/acegisecurity/Organisation.java
rename to core-tiger/src/test/java/org/acegisecurity/annotation/test/Organisation.java
index 0e9d363d86..bebcc08202 100644
--- a/core-tiger/src/test/java/org/acegisecurity/Organisation.java
+++ b/core-tiger/src/test/java/org/acegisecurity/annotation/test/Organisation.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.acegisecurity.annotation.test;
 
 /**
  * An extended version of <code>Entity</code>.
diff --git a/core-tiger/src/test/java/org/acegisecurity/OrganisationService.java b/core-tiger/src/test/java/org/acegisecurity/annotation/test/OrganisationService.java
similarity index 92%
rename from core-tiger/src/test/java/org/acegisecurity/OrganisationService.java
rename to core-tiger/src/test/java/org/acegisecurity/annotation/test/OrganisationService.java
index a2743069bf..a359c0d980 100644
--- a/core-tiger/src/test/java/org/acegisecurity/OrganisationService.java
+++ b/core-tiger/src/test/java/org/acegisecurity/annotation/test/OrganisationService.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.acegisecurity.annotation.test;
 
 /**
  * DOCUMENT ME!
  *
  * @author $author$
- * @version $Revision$
+ * @version $Revision: 1496 $
   */
 public interface OrganisationService extends Service<Organisation> {
     //~ Methods ========================================================================================================
diff --git a/core-tiger/src/test/java/org/acegisecurity/OrganisationServiceImpl.java b/core-tiger/src/test/java/org/acegisecurity/annotation/test/OrganisationServiceImpl.java
similarity index 93%
rename from core-tiger/src/test/java/org/acegisecurity/OrganisationServiceImpl.java
rename to core-tiger/src/test/java/org/acegisecurity/annotation/test/OrganisationServiceImpl.java
index f9c2ceceb6..02e6d79a84 100644
--- a/core-tiger/src/test/java/org/acegisecurity/OrganisationServiceImpl.java
+++ b/core-tiger/src/test/java/org/acegisecurity/annotation/test/OrganisationServiceImpl.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.acegisecurity.annotation.test;
 
 /**
  * DOCUMENT ME!
  *
  * @author $author$
- * @version $Revision$
+ * @version $Revision: 1496 $
   */
 public class OrganisationServiceImpl extends ServiceImpl<Organisation> implements OrganisationService {
     //~ Methods ========================================================================================================
diff --git a/core-tiger/src/test/java/org/acegisecurity/Person.java b/core-tiger/src/test/java/org/acegisecurity/annotation/test/Person.java
similarity index 96%
rename from core-tiger/src/test/java/org/acegisecurity/Person.java
rename to core-tiger/src/test/java/org/acegisecurity/annotation/test/Person.java
index 0381d07667..d64f883066 100644
--- a/core-tiger/src/test/java/org/acegisecurity/Person.java
+++ b/core-tiger/src/test/java/org/acegisecurity/annotation/test/Person.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.acegisecurity.annotation.test;
 
 /**
  * An extended version of <code>Entity</code>.
diff --git a/core-tiger/src/test/java/org/acegisecurity/PersonService.java b/core-tiger/src/test/java/org/acegisecurity/annotation/test/PersonService.java
similarity index 92%
rename from core-tiger/src/test/java/org/acegisecurity/PersonService.java
rename to core-tiger/src/test/java/org/acegisecurity/annotation/test/PersonService.java
index eeed02333c..c3cf3c7feb 100644
--- a/core-tiger/src/test/java/org/acegisecurity/PersonService.java
+++ b/core-tiger/src/test/java/org/acegisecurity/annotation/test/PersonService.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.acegisecurity.annotation.test;
 
 /**
  * DOCUMENT ME!
  *
  * @author $author$
- * @version $Revision$
+ * @version $Revision: 1496 $
   */
 public interface PersonService extends Service<Person> {
     //~ Methods ========================================================================================================
diff --git a/core-tiger/src/test/java/org/acegisecurity/PersonServiceImpl.java b/core-tiger/src/test/java/org/acegisecurity/annotation/test/PersonServiceImpl.java
similarity index 92%
rename from core-tiger/src/test/java/org/acegisecurity/PersonServiceImpl.java
rename to core-tiger/src/test/java/org/acegisecurity/annotation/test/PersonServiceImpl.java
index 3d9a7790ab..3b7ed605e1 100644
--- a/core-tiger/src/test/java/org/acegisecurity/PersonServiceImpl.java
+++ b/core-tiger/src/test/java/org/acegisecurity/annotation/test/PersonServiceImpl.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.acegisecurity.annotation.test;
 
 /**
  * DOCUMENT ME!
  *
  * @author $author$
- * @version $Revision$
+ * @version $Revision: 1496 $
   */
 public class PersonServiceImpl extends ServiceImpl<Person> implements PersonService {
     //~ Methods ========================================================================================================
diff --git a/core-tiger/src/test/java/org/acegisecurity/Service.java b/core-tiger/src/test/java/org/acegisecurity/annotation/test/Service.java
similarity index 96%
rename from core-tiger/src/test/java/org/acegisecurity/Service.java
rename to core-tiger/src/test/java/org/acegisecurity/annotation/test/Service.java
index a294f97f29..63ea5c7fa4 100644
--- a/core-tiger/src/test/java/org/acegisecurity/Service.java
+++ b/core-tiger/src/test/java/org/acegisecurity/annotation/test/Service.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.acegisecurity.annotation.test;
 
 import java.util.Collection;
 
diff --git a/core-tiger/src/test/java/org/acegisecurity/ServiceImpl.java b/core-tiger/src/test/java/org/acegisecurity/annotation/test/ServiceImpl.java
similarity index 94%
rename from core-tiger/src/test/java/org/acegisecurity/ServiceImpl.java
rename to core-tiger/src/test/java/org/acegisecurity/annotation/test/ServiceImpl.java
index 1be2d98283..1b4666e22e 100644
--- a/core-tiger/src/test/java/org/acegisecurity/ServiceImpl.java
+++ b/core-tiger/src/test/java/org/acegisecurity/annotation/test/ServiceImpl.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.acegisecurity.annotation.test;
 
 import java.util.Collection;
 
@@ -22,7 +22,7 @@ import java.util.Collection;
  * DOCUMENT ME!
  *
  * @author $author$
- * @version $Revision$
+ * @version $Revision: 1496 $
   *
  * @param <E> DOCUMENT ME!
  */