diff --git a/core/src/test/java/org/springframework/security/access/annotation/test/Entity.java b/core/src/test/java/org/springframework/security/access/annotation/test/Entity.java
deleted file mode 100644
index d547102b42..0000000000
--- a/core/src/test/java/org/springframework/security/access/annotation/test/Entity.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.access.annotation.test;
-
-import org.springframework.util.Assert;
-
-
-/**
- * An entity used in our generics testing.
- *
- * @author Ben Alex
- */
-public class Entity {
-    //~ Instance fields ================================================================================================
-
-    String info;
-
-    //~ Constructors ===================================================================================================
-
-    public Entity(String info) {
-        Assert.hasText(info, "Some information must be given!");
-        this.info = info;
-    }
-
-    //~ Methods ========================================================================================================
-
-    public String getInfo() {
-        return info;
-    }
-
-    void makeLowercase() {
-        this.info = info.toLowerCase();
-    }
-
-    void makeUppercase() {
-        this.info = info.toUpperCase();
-    }
-}
diff --git a/core/src/test/java/org/springframework/security/access/annotation/test/Organisation.java b/core/src/test/java/org/springframework/security/access/annotation/test/Organisation.java
deleted file mode 100644
index d3d6b0c46d..0000000000
--- a/core/src/test/java/org/springframework/security/access/annotation/test/Organisation.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.access.annotation.test;
-
-/**
- * An extended version of <code>Entity</code>.
- *
- * @author Ben Alex
- */
-public class Organisation extends Entity {
-    //~ Instance fields ================================================================================================
-
-    private boolean active = true;
-
-    //~ Constructors ===================================================================================================
-
-    public Organisation(String name) {
-        super(name);
-    }
-
-    //~ Methods ========================================================================================================
-
-    void deactive() {
-        this.active = true;
-    }
-
-    public boolean isActive() {
-        return this.active;
-    }
-}
diff --git a/core/src/test/java/org/springframework/security/access/annotation/test/OrganisationService.java b/core/src/test/java/org/springframework/security/access/annotation/test/OrganisationService.java
deleted file mode 100644
index 86ec72b6be..0000000000
--- a/core/src/test/java/org/springframework/security/access/annotation/test/OrganisationService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.access.annotation.test;
-
-/**
- * DOCUMENT ME!
- *
-  */
-public interface OrganisationService extends Service<Organisation> {
-    //~ Methods ========================================================================================================
-
-    public void deactive(Organisation org);
-}
diff --git a/core/src/test/java/org/springframework/security/access/annotation/test/OrganisationServiceImpl.java b/core/src/test/java/org/springframework/security/access/annotation/test/OrganisationServiceImpl.java
deleted file mode 100644
index 13878236fc..0000000000
--- a/core/src/test/java/org/springframework/security/access/annotation/test/OrganisationServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.access.annotation.test;
-
-/**
- *
- */
-public class OrganisationServiceImpl extends ServiceImpl<Organisation> implements OrganisationService {
-    //~ Methods ========================================================================================================
-
-    public void deactive(Organisation org) {
-        org.deactive();
-    }
-}
diff --git a/core/src/test/java/org/springframework/security/access/annotation/test/Person.java b/core/src/test/java/org/springframework/security/access/annotation/test/Person.java
deleted file mode 100644
index 4389ccd25a..0000000000
--- a/core/src/test/java/org/springframework/security/access/annotation/test/Person.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.access.annotation.test;
-
-/**
- * An extended version of <code>Entity</code>.
- *
- * @author Ben Alex
- */
-public class Person extends Entity {
-    //~ Instance fields ================================================================================================
-
-    private boolean active = true;
-
-    //~ Constructors ===================================================================================================
-
-    public Person(String name) {
-        super(name);
-    }
-
-    //~ Methods ========================================================================================================
-
-    void deactive() {
-        this.active = true;
-    }
-
-    public boolean isActive() {
-        return this.active;
-    }
-}
diff --git a/core/src/test/java/org/springframework/security/access/annotation/test/PersonService.java b/core/src/test/java/org/springframework/security/access/annotation/test/PersonService.java
deleted file mode 100644
index 2d38979aa6..0000000000
--- a/core/src/test/java/org/springframework/security/access/annotation/test/PersonService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.access.annotation.test;
-
-/**
- *
- */
-public interface PersonService extends Service<Person> {
-    //~ Methods ========================================================================================================
-
-    public void deactive(Person person);
-}
diff --git a/core/src/test/java/org/springframework/security/access/annotation/test/PersonServiceImpl.java b/core/src/test/java/org/springframework/security/access/annotation/test/PersonServiceImpl.java
deleted file mode 100644
index 65d3649d42..0000000000
--- a/core/src/test/java/org/springframework/security/access/annotation/test/PersonServiceImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.access.annotation.test;
-
-/**
- * DOCUMENT ME!
- *
-  */
-public class PersonServiceImpl extends ServiceImpl<Person> implements PersonService {
-    //~ Methods ========================================================================================================
-
-    public void deactive(Person person) {
-        person.deactive();
-    }
-}
diff --git a/core/src/test/java/org/springframework/security/access/annotation/test/Service.java b/core/src/test/java/org/springframework/security/access/annotation/test/Service.java
deleted file mode 100644
index ed7a4ddb86..0000000000
--- a/core/src/test/java/org/springframework/security/access/annotation/test/Service.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.access.annotation.test;
-
-import java.util.Collection;
-
-
-/**
- * An interface that uses Java 5 generics.
- *
- * @author Ben Alex
- */
-public interface Service<E extends Entity> {
-    //~ Methods ========================================================================================================
-
-    public int countElements(Collection<E> ids);
-
-    public void makeLowerCase(E input);
-
-    public void makeUpperCase(E input);
-
-    public void publicMakeLowerCase(E input);
-}
diff --git a/core/src/test/java/org/springframework/security/access/annotation/test/ServiceImpl.java b/core/src/test/java/org/springframework/security/access/annotation/test/ServiceImpl.java
deleted file mode 100644
index d7f3035746..0000000000
--- a/core/src/test/java/org/springframework/security/access/annotation/test/ServiceImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.access.annotation.test;
-
-import java.util.Collection;
-
-
-/**
- *
- */
-public class ServiceImpl<E extends Entity> implements Service<E> {
-    //~ Methods ========================================================================================================
-
-    public int countElements(Collection<E> ids) {
-        return 0;
-    }
-
-    public void makeLowerCase(E input) {
-        input.makeLowercase();
-    }
-
-    public void makeUpperCase(E input) {
-        input.makeUppercase();
-    }
-
-    public void publicMakeLowerCase(E input) {
-        input.makeUppercase();
-    }
-}