diff --git a/org.springframework.context/src/test/java/org/springframework/context/event/LifecycleEventTests.java b/org.springframework.context/src/test/java/org/springframework/context/event/LifecycleEventTests.java
new file mode 100644
index 0000000000..5fa2f37ccf
--- /dev/null
+++ b/org.springframework.context/src/test/java/org/springframework/context/event/LifecycleEventTests.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2002-2007 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.context.event;
+
+import junit.framework.TestCase;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.Lifecycle;
+import org.springframework.context.support.StaticApplicationContext;
+
+/**
+ * @author Mark Fisher
+ * @author Juergen Hoeller
+ */
+public class LifecycleEventTests extends TestCase {
+
+	public void testContextStartedEvent() {
+		StaticApplicationContext context = new StaticApplicationContext();
+		context.registerSingleton("lifecycle", LifecycleTestBean.class);
+		context.registerSingleton("listener", LifecycleListener.class);
+		context.refresh();
+		LifecycleTestBean lifecycleBean = (LifecycleTestBean) context.getBean("lifecycle");
+		LifecycleListener listener = (LifecycleListener) context.getBean("listener");
+		assertFalse(lifecycleBean.isRunning());
+		assertEquals(0, listener.getStartedCount());
+		context.start();
+		assertTrue(lifecycleBean.isRunning());
+		assertEquals(1, listener.getStartedCount());
+		assertSame(context, listener.getApplicationContext());
+	}
+
+	public void testContextStoppedEvent() {
+		StaticApplicationContext context = new StaticApplicationContext();
+		context.registerSingleton("lifecycle", LifecycleTestBean.class);
+		context.registerSingleton("listener", LifecycleListener.class);
+		context.refresh();
+		LifecycleTestBean lifecycleBean = (LifecycleTestBean) context.getBean("lifecycle");
+		LifecycleListener listener = (LifecycleListener) context.getBean("listener");
+		assertFalse(lifecycleBean.isRunning());
+		context.start();
+		assertTrue(lifecycleBean.isRunning());
+		assertEquals(0, listener.getStoppedCount());		
+		context.stop();
+		assertFalse(lifecycleBean.isRunning());
+		assertEquals(1, listener.getStoppedCount());
+		assertSame(context, listener.getApplicationContext());
+	}
+
+
+	private static class LifecycleListener implements ApplicationListener {
+
+		private ApplicationContext context;
+
+		private int startedCount;
+
+		private int stoppedCount;
+
+		public void onApplicationEvent(ApplicationEvent event) {
+			if (event instanceof ContextStartedEvent) {
+				this.context = ((ContextStartedEvent) event).getApplicationContext();
+				this.startedCount++;
+			}
+			else if (event instanceof ContextStoppedEvent) {
+				this.context = ((ContextStoppedEvent) event).getApplicationContext();
+				this.stoppedCount++;
+			}
+		}
+
+		public ApplicationContext getApplicationContext() {
+			return this.context;
+		}
+
+		public int getStartedCount() {
+			return this.startedCount;
+		}
+
+		public int getStoppedCount() {
+			return this.stoppedCount;
+		}
+	}
+
+
+	private static class LifecycleTestBean implements Lifecycle {
+
+		private boolean running;
+
+		public boolean isRunning() {
+			return this.running;
+		}
+
+		public void start() {
+			this.running = true;
+		}
+
+		public void stop() {
+			this.running = false;
+		}
+	}
+
+}
diff --git a/org.springframework.context/src/test/java/org/springframework/core/task/NoOpRunnable.java b/org.springframework.context/src/test/java/org/springframework/core/task/NoOpRunnable.java
new file mode 100644
index 0000000000..56f4923c37
--- /dev/null
+++ b/org.springframework.context/src/test/java/org/springframework/core/task/NoOpRunnable.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2002-2007 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.core.task;
+
+/**
+ * A no-op Runnable implementation.
+ *
+ * @author Rick Evans
+ */
+public class NoOpRunnable implements Runnable {
+
+	public void run() {
+		// explicit no-op
+	}
+
+}
\ No newline at end of file
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutorTests.java b/org.springframework.context/src/test/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutorTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutorTests.java
rename to org.springframework.context/src/test/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutorTests.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