diff --git a/org.springframework.testsuite/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java b/org.springframework.context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java
rename to org.springframework.context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/remoting/support/RemoteInvocationUtilsTests.java b/org.springframework.context/src/test/java/org/springframework/remoting/support/RemoteInvocationUtilsTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/remoting/support/RemoteInvocationUtilsTests.java
rename to org.springframework.context/src/test/java/org/springframework/remoting/support/RemoteInvocationUtilsTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scheduling/backportconcurrent/ScheduledExecutorFactoryBeanTests.java b/org.springframework.context/src/test/java/org/springframework/scheduling/backportconcurrent/ScheduledExecutorFactoryBeanTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scheduling/backportconcurrent/ScheduledExecutorFactoryBeanTests.java
rename to org.springframework.context/src/test/java/org/springframework/scheduling/backportconcurrent/ScheduledExecutorFactoryBeanTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutorTests.java b/org.springframework.context/src/test/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutorTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutorTests.java
rename to org.springframework.context/src/test/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutorTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java b/org.springframework.context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
rename to org.springframework.context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java b/org.springframework.context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java
similarity index 82%
rename from org.springframework.testsuite/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java
rename to org.springframework.context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java
index 4d7e41ce2b0d14cb52b01971cb08779840a76d03..0655210a429cf546b43b2f7c69caeca548a12993 100644
--- a/org.springframework.testsuite/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java
+++ b/org.springframework.context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java
@@ -16,46 +16,40 @@
 
 package org.springframework.scheduling.timer;
 
-import junit.framework.TestCase;
-import org.springframework.test.AssertThrows;
+import static org.junit.Assert.*;
 
 import java.util.Timer;
 
+import org.junit.Test;
+
 /**
  * Unit tests for the {@link TimerTaskExecutor} class.
  *
  * @author Rick Evans
+ * @author Chris Beams
  */
-public final class TimerTaskExecutorTests extends TestCase {
+public final class TimerTaskExecutorTests {
 
+	@Test(expected=IllegalArgumentException.class)
 	public void testExecuteChokesWithNullTimer() throws Exception {
-		new AssertThrows(IllegalArgumentException.class) {
-			public void test() throws Exception {
-				TimerTaskExecutor executor = new TimerTaskExecutor();
-				executor.execute(new NoOpRunnable());
-			}
-		}.runTest();
+		TimerTaskExecutor executor = new TimerTaskExecutor();
+		executor.execute(new NoOpRunnable());
 	}
 
+	@Test(expected=IllegalArgumentException.class)
 	public void testExecuteChokesWithNullTask() throws Exception {
-		new AssertThrows(IllegalArgumentException.class) {
-			public void test() throws Exception {
-				TimerTaskExecutor executor = new TimerTaskExecutor(new Timer());
-				executor.execute(null);
-			}
-		}.runTest();
+		TimerTaskExecutor executor = new TimerTaskExecutor(new Timer());
+		executor.execute(null);
 	}
 
+	@Test(expected=IllegalArgumentException.class)
 	public void testExecuteChokesWithNegativeDelay() throws Exception {
-		new AssertThrows(IllegalArgumentException.class) {
-			public void test() throws Exception {
-				TimerTaskExecutor executor = new TimerTaskExecutor(new Timer());
-				executor.setDelay(-10);
-				executor.execute(new NoOpRunnable());
-			}
-		}.runTest();
+		TimerTaskExecutor executor = new TimerTaskExecutor(new Timer());
+		executor.setDelay(-10);
+		executor.execute(new NoOpRunnable());
 	}
 
+	@Test
 	public void testExecuteReallyDoesScheduleTheSuppliedTask() throws Exception {
 		final Object monitor = new Object();
 
@@ -71,14 +65,12 @@ public final class TimerTaskExecutorTests extends TestCase {
 		assertTrue("Supplied task (a Runnable) is not being invoked.", task.isRunWasCalled());
 	}
 
+	@Test(expected=IllegalArgumentException.class)
 	public void testCtorWithNullTimer() throws Exception {
-		new AssertThrows(IllegalArgumentException.class) {
-			public void test() throws Exception {
-				new TimerTaskExecutor(null);
-			}
-		}.runTest();
+		new TimerTaskExecutor(null);
 	}
 
+	@Test
 	public void testCreateTimerMethodIsCalledIfNoTimerIsExplicitlySupplied() throws Exception {
 		CreationAwareTimerTaskExecutor executor = new CreationAwareTimerTaskExecutor();
 		executor.afterPropertiesSet();
@@ -87,6 +79,7 @@ public final class TimerTaskExecutorTests extends TestCase {
 				executor.isCreateTimerWasCalled());
 	}
 
+	@Test
 	public void testCreateTimerMethodIsNotCalledIfTimerIsExplicitlySupplied() throws Exception {
 		CreationAwareTimerTaskExecutor executor = new CreationAwareTimerTaskExecutor();
 		executor.setTimer(new Timer());
@@ -96,6 +89,7 @@ public final class TimerTaskExecutorTests extends TestCase {
 				executor.isCreateTimerWasCalled());
 	}
 
+	@Test
 	public void testThatTheDestroyCallbackCancelsTheTimerIfNoTimerIsExplicitlySupplied() throws Exception {
 
 		final CancelAwareTimer timer = new CancelAwareTimer();
@@ -113,6 +107,7 @@ public final class TimerTaskExecutorTests extends TestCase {
 				timer.isCancelWasCalled());
 	}
 
+	@Test
 	public void testThatTheDestroyCallbackDoesNotCancelTheTimerIfTheTimerWasSuppliedExplictly() throws Exception {
 		TimerTaskExecutor executor = new TimerTaskExecutor();
 		CancelAwareTimer timer = new CancelAwareTimer();
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scheduling/TestMethodInvokingTask.java b/org.springframework.testsuite/src/test/java/org/springframework/scheduling/TestMethodInvokingTask.java
deleted file mode 100644
index 364610db9e8445c17706855fdea606737b67c8a9..0000000000000000000000000000000000000000
--- a/org.springframework.testsuite/src/test/java/org/springframework/scheduling/TestMethodInvokingTask.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.scheduling;
-
-/**
- * @author Juergen Hoeller
- * @since 09.10.2004
- */
-public class TestMethodInvokingTask {
-
-	public int counter = 0;
-
-	private Object lock = new Object();
-
-	public void doSomething() {
-		this.counter++;
-	}
-
-	public void doWait() {
-		this.counter++;
-		// wait until stop is called
-		synchronized (this.lock) {
-			try {
-				this.lock.wait();
-			}
-			catch (InterruptedException e) {
-				// fall through
-			}
-		}
-	}
-
-	public void stop() {
-		synchronized(this.lock) {
-			this.lock.notify();
-		}
-	}
-
-}
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java b/org.springframework.web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
rename to org.springframework.web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java b/org.springframework.web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java
rename to org.springframework.web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java b/org.springframework.web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java
rename to org.springframework.web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/remoting/jaxws/JaxWsSupportTests.java b/org.springframework.web/src/test/java/org/springframework/remoting/jaxws/JaxWsSupportTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/remoting/jaxws/JaxWsSupportTests.java
rename to org.springframework.web/src/test/java/org/springframework/remoting/jaxws/JaxWsSupportTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java b/org.springframework.web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java
rename to org.springframework.web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/remoting/jaxws/OrderService.java b/org.springframework.web/src/test/java/org/springframework/remoting/jaxws/OrderService.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/remoting/jaxws/OrderService.java
rename to org.springframework.web/src/test/java/org/springframework/remoting/jaxws/OrderService.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java b/org.springframework.web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java
rename to org.springframework.web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java