diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/autoproxy/pertarget.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/autoproxy/pertarget.xml
index ed540c1a5bb..05a30cecb4b 100644
--- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/autoproxy/pertarget.xml
+++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/autoproxy/pertarget.xml
@@ -5,7 +5,7 @@
 
 	<bean class="org.springframework.aop.aspectj.annotation.AnnotationAwareAspectJAutoProxyCreator"/>
 
-	<bean class="org.springframework.aop.aspectj.annotation.AbstractAspectJAdvisorFactoryTests$PerTargetAspect"
+	<bean class="example.aspects.PerTargetAspect"
 			scope="prototype">
 		<property name="order" value="5"/>
 	</bean>
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/autoproxy/twoAdviceAspect.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/autoproxy/twoAdviceAspect.xml
index 4aff5af9390..2099c8bb1b1 100644
--- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/autoproxy/twoAdviceAspect.xml
+++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/autoproxy/twoAdviceAspect.xml
@@ -5,7 +5,7 @@
 
 	<bean class="org.springframework.aop.aspectj.annotation.AnnotationAwareAspectJAutoProxyCreator"/>
 
-	<bean id="aspect" class="org.springframework.aop.aspectj.annotation.AbstractAspectJAdvisorFactoryTests$TwoAdviceAspect"/>
+	<bean id="aspect" class="example.aspects.TwoAdviceAspect"/>
 
 	<bean id="adrian" class="org.springframework.beans.TestBean" scope="prototype">
 		<property name="name" value="adrian"/>
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/autoproxy/twoAdviceAspectPrototype.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/autoproxy/twoAdviceAspectPrototype.xml
index 12dfcd3419a..286dcf3de90 100644
--- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/autoproxy/twoAdviceAspectPrototype.xml
+++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/autoproxy/twoAdviceAspectPrototype.xml
@@ -5,7 +5,7 @@
 
 	<bean class="org.springframework.aop.aspectj.annotation.AnnotationAwareAspectJAutoProxyCreator"/>
 
-	<bean id="aspect" class="org.springframework.aop.aspectj.annotation.AbstractAspectJAdvisorFactoryTests$TwoAdviceAspect"
+	<bean id="aspect" class="example.aspects.TwoAdviceAspect"
 			scope="prototype"/>
 
 	<bean id="adrian" class="org.springframework.beans.TestBean" scope="prototype">