diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
similarity index 87%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
rename to org.springframework.aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
index d6deb96c0ab..c284215a74b 100644
--- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
+++ b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
@@ -16,23 +16,26 @@
 
 package org.springframework.aop.aspectj;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
+
+import org.junit.Test;
 import org.springframework.aop.framework.autoproxy.CountingTestBean;
 import org.springframework.beans.IOther;
 import org.springframework.beans.ITestBean;
 import org.springframework.beans.TestBean;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.test.AssertThrows;
 
 /**
  * Unit tests for the {@link TypePatternClassFilter} class.
  *
  * @author Rod Johnson
  * @author Rick Evans
+ * @author Chris Beams
  */
-public final class TypePatternClassFilterTests extends TestCase {
+public final class TypePatternClassFilterTests {
 
+    @Test
 	public void testInvalidPattern() {
 		try {
 			new TypePatternClassFilter("-");
@@ -42,6 +45,7 @@ public final class TypePatternClassFilterTests extends TestCase {
 		}
 	}
 
+    @Test
 	public void testValidPatternMatching() {
 		TypePatternClassFilter tpcf = new TypePatternClassFilter("org.springframework.beans.*");
 		assertTrue("Must match: in package", tpcf.matches(TestBean.class));
@@ -52,6 +56,7 @@ public final class TypePatternClassFilterTests extends TestCase {
 		assertFalse("Must be excluded: in wrong package", tpcf.matches(DefaultListableBeanFactory.class));
 	}
 
+    @Test
 	public void testSubclassMatching() {
 		TypePatternClassFilter tpcf = new TypePatternClassFilter("org.springframework.beans.ITestBean+");
 		assertTrue("Must match: in package", tpcf.matches(TestBean.class));
@@ -61,6 +66,7 @@ public final class TypePatternClassFilterTests extends TestCase {
 		assertFalse("Must be excluded: not subclass", tpcf.matches(DefaultListableBeanFactory.class));
 	}
 	
+    @Test
 	public void testAndOrNotReplacement() {
 		TypePatternClassFilter tpcf = new TypePatternClassFilter("java.lang.Object or java.lang.String");
 		assertFalse("matches Number",tpcf.matches(Number.class));
@@ -74,20 +80,14 @@ public final class TypePatternClassFilterTests extends TestCase {
 		assertTrue("matches Double",tpcf.matches(Double.class));	
 	}
 
+    @Test(expected=IllegalArgumentException.class)
 	public void testSetTypePatternWithNullArgument() throws Exception {
-		new AssertThrows(IllegalArgumentException.class) {
-			public void test() throws Exception {
-				new TypePatternClassFilter(null);
-			}
-		}.runTest();
+        new TypePatternClassFilter(null);
 	}
 
+    @Test(expected=IllegalStateException.class)
 	public void testInvocationOfMatchesMethodBlowsUpWhenNoTypePatternHasBeenSet() throws Exception {
-		new AssertThrows(IllegalStateException.class) {
-			public void test() throws Exception {
-				new TypePatternClassFilter().matches(String.class);
-			}
-		}.runTest();
+		new TypePatternClassFilter().matches(String.class);
 	}
 
 }
diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/framework/autoproxy/CountingTestBean.java b/org.springframework.aop/src/test/java/org/springframework/aop/framework/autoproxy/CountingTestBean.java
new file mode 100644
index 00000000000..6ec5d89ed41
--- /dev/null
+++ b/org.springframework.aop/src/test/java/org/springframework/aop/framework/autoproxy/CountingTestBean.java
@@ -0,0 +1,37 @@
+/*
+ *	$Id$
+ */
+
+/*
+ * Copyright 2002-2005 the original author or authors.
+ *
+ * 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.aop.framework.autoproxy;
+
+import org.springframework.beans.TestBean;
+
+/**
+ * @author Juergen Hoeller
+ * @since 15.03.2005
+ */
+public class CountingTestBean extends TestBean {
+
+	public static int count = 0;
+
+	public CountingTestBean() {
+		count++;
+	}
+
+}