diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
index 83e1653cd11..162ab6b9a59 100644
--- a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
+++ b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
@@ -50,12 +50,12 @@ import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.util.ObjectUtils;
 
-import test.aspect.PerTargetAspect;
-import test.aspect.TwoAdviceAspect;
+import test.aop.DefaultLockable;
+import test.aop.Lockable;
+import test.aop.PerTargetAspect;
+import test.aop.TwoAdviceAspect;
 import test.beans.ITestBean;
 import test.beans.TestBean;
-import test.mixin.DefaultLockable;
-import test.mixin.Lockable;
 
 /**
  * Abstract tests for AspectJAdvisorFactory.
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java
index fb91a3d4881..ead9f1f62cc 100644
--- a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java
+++ b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java
@@ -24,7 +24,7 @@ import org.springframework.aop.aspectj.AspectJExpressionPointcut;
 import org.springframework.aop.aspectj.AspectJExpressionPointcutTests;
 import org.springframework.aop.framework.AopConfigException;
 
-import test.aspect.PerTargetAspect;
+import test.aop.PerTargetAspect;
 import test.beans.TestBean;
 
 
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java
index 07d97abf4c2..f1c32fe992e 100644
--- a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java
+++ b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java
@@ -23,7 +23,7 @@ import org.junit.Test;
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.aspectj.annotation.AbstractAspectJAdvisorFactoryTests.ExceptionAspect;
 
-import test.aspect.PerTargetAspect;
+import test.aop.PerTargetAspect;
 
 
 /**
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java
index 74be402eabf..58c5b3226e0 100644
--- a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java
+++ b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java
@@ -23,7 +23,7 @@ import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.junit.Test;
 
-import test.aspect.PerThisAspect;
+import test.aop.PerThisAspect;
 
 
 /**
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
index 1cb396cabbb..dd4c9ef0913 100644
--- a/org.springframework.aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
+++ b/org.springframework.aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
@@ -33,11 +33,11 @@ import org.springframework.aop.support.DefaultIntroductionAdvisor;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.aop.support.DelegatingIntroductionInterceptor;
 
-import test.advice.MethodCounter;
+import test.aop.MethodCounter;
+import test.aop.NopInterceptor;
 import test.beans.IOther;
 import test.beans.ITestBean;
 import test.beans.TestBean;
-import test.interceptor.NopInterceptor;
 import test.util.TimeStamped;
 
 /**
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java
index 943535713a7..e8d99f91eac 100644
--- a/org.springframework.aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java
+++ b/org.springframework.aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java
@@ -35,7 +35,7 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.aop.ThrowsAdvice;
 
-import test.advice.MethodCounter;
+import test.aop.MethodCounter;
 
 /**
  * Unit tests for {@link ThrowsAdviceInterceptor}
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml b/org.springframework.aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml
index a3ce25dd047..a4eef4491ba 100644
--- a/org.springframework.aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml
+++ b/org.springframework.aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml
@@ -6,7 +6,7 @@
 -->
 <beans>
 	
-	<bean id="nopInterceptor" class="test.interceptor.NopInterceptor"/>
+	<bean id="nopInterceptor" class="test.aop.NopInterceptor"/>
 
 	<bean id="exposeInvocation" class="org.springframework.beans.factory.config.FieldRetrievingFactoryBean">
 		<property name="targetClass">
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
index 23155444d51..c423579aa01 100644
--- a/org.springframework.aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
+++ b/org.springframework.aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
@@ -27,8 +27,8 @@ import org.springframework.aop.Pointcut;
 import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
 import org.springframework.aop.target.EmptyTargetSource;
 
+import test.aop.NopInterceptor;
 import test.beans.TestBean;
-import test.interceptor.NopInterceptor;
 import test.util.SerializationTestUtils;
 
 /**
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java
index a8645364a6e..ed17db66188 100644
--- a/org.springframework.aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java
+++ b/org.springframework.aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java
@@ -22,9 +22,9 @@ import org.junit.Test;
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.framework.ProxyFactory;
 
+import test.aop.NopInterceptor;
 import test.beans.ITestBean;
 import test.beans.TestBean;
-import test.interceptor.NopInterceptor;
 
 /**
  * @author Rod Johnson
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
index 4cb0036c471..c4b4cc5dece 100644
--- a/org.springframework.aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
+++ b/org.springframework.aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
@@ -27,13 +27,13 @@ import org.springframework.aop.IntroductionAdvisor;
 import org.springframework.aop.IntroductionInterceptor;
 import org.springframework.aop.framework.ProxyFactory;
 
+import test.aop.SerializableNopInterceptor;
 import test.beans.INestedTestBean;
 import test.beans.ITestBean;
 import test.beans.NestedTestBean;
 import test.beans.Person;
 import test.beans.SerializablePerson;
 import test.beans.TestBean;
-import test.interceptor.SerializableNopInterceptor;
 import test.util.SerializationTestUtils;
 import test.util.TimeStamped;
 
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java
index b69cfbca10b..1d6a3531564 100644
--- a/org.springframework.aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java
+++ b/org.springframework.aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java
@@ -23,10 +23,10 @@ import org.junit.Test;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.framework.ProxyFactory;
 
+import test.aop.NopInterceptor;
+import test.aop.SerializableNopInterceptor;
 import test.beans.Person;
 import test.beans.SerializablePerson;
-import test.interceptor.NopInterceptor;
-import test.interceptor.SerializableNopInterceptor;
 import test.util.SerializationTestUtils;
 
 /**
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml b/org.springframework.aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml
index 343232a0e90..1e3ae07f26a 100644
--- a/org.springframework.aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml
+++ b/org.springframework.aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml
@@ -9,7 +9,7 @@
 		<property name="age"><value>666</value></property>
 	</bean>
 
-	<bean id="nopInterceptor" class="test.interceptor.SerializableNopInterceptor"/>
+	<bean id="nopInterceptor" class="test.aop.SerializableNopInterceptor"/>
 
 	<bean id="settersAdvisor" class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
 		<property name="advice"><ref local="nopInterceptor"/></property>
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
index 73cbe440237..3b90868cad7 100644
--- a/org.springframework.aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
+++ b/org.springframework.aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
@@ -24,11 +24,11 @@ import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanFactory;
 import org.springframework.core.io.ClassPathResource;
 
+import test.aop.NopInterceptor;
+import test.aop.SerializableNopInterceptor;
 import test.beans.ITestBean;
 import test.beans.Person;
 import test.beans.TestBean;
-import test.interceptor.NopInterceptor;
-import test.interceptor.SerializableNopInterceptor;
 import test.util.SerializationTestUtils;
 
 /**
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
index 196acfdd0e5..59cecf140d6 100644
--- a/org.springframework.aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
+++ b/org.springframework.aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
@@ -27,10 +27,10 @@ import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.beans.factory.xml.XmlBeanFactory;
 import org.springframework.core.io.ClassPathResource;
 
+import test.aop.SerializableNopInterceptor;
 import test.beans.Person;
 import test.beans.SerializablePerson;
 import test.beans.SideEffectBean;
-import test.interceptor.SerializableNopInterceptor;
 import test.util.SerializationTestUtils;
 
 
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml b/org.springframework.aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml
index 84703ecdc74..b271b1f5565 100644
--- a/org.springframework.aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml
+++ b/org.springframework.aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml
@@ -16,7 +16,7 @@
 		<property name="targetBeanName"><value>prototypeTest</value></property>
 	</bean>
 	
-	<bean id="debugInterceptor" class="test.interceptor.NopInterceptor" />
+	<bean id="debugInterceptor" class="test.aop.NopInterceptor" />
 	
 	<bean id="singleton" class="org.springframework.aop.framework.ProxyFactoryBean">
 		<property name="interceptorNames"><value>debugInterceptor,test</value></property>		
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml b/org.springframework.aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml
index 24ccf836775..f4c41190ff8 100644
--- a/org.springframework.aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml
+++ b/org.springframework.aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml
@@ -11,7 +11,7 @@
 		<property name="targetBeanName"><value>prototypeTest</value></property>
 	</bean>
 	
-	<bean id="debugInterceptor" class="test.interceptor.NopInterceptor" />
+	<bean id="debugInterceptor" class="test.aop.NopInterceptor" />
 	
 	<!--
 		We want to invoke the getStatsMixin method on our ThreadLocal invoker
diff --git a/org.springframework.aop/src/test/java/test/mixin/DefaultLockable.java b/org.springframework.aop/src/test/java/test/aop/DefaultLockable.java
similarity index 97%
rename from org.springframework.aop/src/test/java/test/mixin/DefaultLockable.java
rename to org.springframework.aop/src/test/java/test/aop/DefaultLockable.java
index 77c7e96c566..42d6c73cb09 100644
--- a/org.springframework.aop/src/test/java/test/mixin/DefaultLockable.java
+++ b/org.springframework.aop/src/test/java/test/aop/DefaultLockable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.mixin;
+package test.aop;
 
 /**
  * Simple implementation of Lockable interface for use in mixins.
diff --git a/org.springframework.aop/src/test/java/test/mixin/Lockable.java b/org.springframework.aop/src/test/java/test/aop/Lockable.java
similarity index 97%
rename from org.springframework.aop/src/test/java/test/mixin/Lockable.java
rename to org.springframework.aop/src/test/java/test/aop/Lockable.java
index 75b3e3c51c1..94272745673 100644
--- a/org.springframework.aop/src/test/java/test/mixin/Lockable.java
+++ b/org.springframework.aop/src/test/java/test/aop/Lockable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.mixin;
+package test.aop;
 
 
 /**
diff --git a/org.springframework.aop/src/test/java/test/advice/MethodCounter.java b/org.springframework.aop/src/test/java/test/aop/MethodCounter.java
similarity index 98%
rename from org.springframework.aop/src/test/java/test/advice/MethodCounter.java
rename to org.springframework.aop/src/test/java/test/aop/MethodCounter.java
index c7f660a511a..9c5ed06e9ac 100644
--- a/org.springframework.aop/src/test/java/test/advice/MethodCounter.java
+++ b/org.springframework.aop/src/test/java/test/aop/MethodCounter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.advice;
+package test.aop;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
diff --git a/org.springframework.aop/src/test/java/test/interceptor/NopInterceptor.java b/org.springframework.aop/src/test/java/test/aop/NopInterceptor.java
similarity index 98%
rename from org.springframework.aop/src/test/java/test/interceptor/NopInterceptor.java
rename to org.springframework.aop/src/test/java/test/aop/NopInterceptor.java
index dcd9c53eca9..81bdd9e703f 100644
--- a/org.springframework.aop/src/test/java/test/interceptor/NopInterceptor.java
+++ b/org.springframework.aop/src/test/java/test/aop/NopInterceptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.interceptor;
+package test.aop;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
diff --git a/org.springframework.aop/src/test/java/test/aspect/PerTargetAspect.java b/org.springframework.aop/src/test/java/test/aop/PerTargetAspect.java
similarity index 96%
rename from org.springframework.aop/src/test/java/test/aspect/PerTargetAspect.java
rename to org.springframework.aop/src/test/java/test/aop/PerTargetAspect.java
index 79977f0cb1d..2d373f17e7a 100644
--- a/org.springframework.aop/src/test/java/test/aspect/PerTargetAspect.java
+++ b/org.springframework.aop/src/test/java/test/aop/PerTargetAspect.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package test.aspect;
+package test.aop;
 
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
diff --git a/org.springframework.aop/src/test/java/test/aspect/PerThisAspect.java b/org.springframework.aop/src/test/java/test/aop/PerThisAspect.java
similarity index 98%
rename from org.springframework.aop/src/test/java/test/aspect/PerThisAspect.java
rename to org.springframework.aop/src/test/java/test/aop/PerThisAspect.java
index 2d7438858d7..ec55a51ecf6 100644
--- a/org.springframework.aop/src/test/java/test/aspect/PerThisAspect.java
+++ b/org.springframework.aop/src/test/java/test/aop/PerThisAspect.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.aspect;
+package test.aop;
 
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
diff --git a/org.springframework.aop/src/test/java/test/interceptor/SerializableNopInterceptor.java b/org.springframework.aop/src/test/java/test/aop/SerializableNopInterceptor.java
similarity index 97%
rename from org.springframework.aop/src/test/java/test/interceptor/SerializableNopInterceptor.java
rename to org.springframework.aop/src/test/java/test/aop/SerializableNopInterceptor.java
index 67d1f23e9ea..ca425b81f6c 100644
--- a/org.springframework.aop/src/test/java/test/interceptor/SerializableNopInterceptor.java
+++ b/org.springframework.aop/src/test/java/test/aop/SerializableNopInterceptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.interceptor;
+package test.aop;
 
 import java.io.Serializable;
 
diff --git a/org.springframework.aop/src/test/java/test/aspect/TwoAdviceAspect.java b/org.springframework.aop/src/test/java/test/aop/TwoAdviceAspect.java
similarity index 98%
rename from org.springframework.aop/src/test/java/test/aspect/TwoAdviceAspect.java
rename to org.springframework.aop/src/test/java/test/aop/TwoAdviceAspect.java
index 85eb6b7557d..42ee4bf0ca3 100644
--- a/org.springframework.aop/src/test/java/test/aspect/TwoAdviceAspect.java
+++ b/org.springframework.aop/src/test/java/test/aop/TwoAdviceAspect.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.aspect;
+package test.aop;
 
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;