diff --git a/org.springframework.context/src/test/java/org/springframework/context/BeanThatBroadcasts.java b/org.springframework.context/src/test/java/org/springframework/context/BeanThatBroadcasts.java
new file mode 100644
index 0000000000..cd125725f3
--- /dev/null
+++ b/org.springframework.context/src/test/java/org/springframework/context/BeanThatBroadcasts.java
@@ -0,0 +1,36 @@
+/*
+ * 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;
+
+/**
+ * @author Juergen Hoeller
+ */
+public class BeanThatBroadcasts implements ApplicationContextAware {
+
+	public ApplicationContext applicationContext;
+
+	public int receivedCount;
+
+
+	public void setApplicationContext(ApplicationContext applicationContext) {
+		this.applicationContext = applicationContext;
+		if (applicationContext.getDisplayName().indexOf("listener") != -1) {
+			applicationContext.getBean("listener");
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/org.springframework.context/src/test/java/org/springframework/context/BeanThatListens.java b/org.springframework.context/src/test/java/org/springframework/context/BeanThatListens.java
new file mode 100644
index 0000000000..ecd1c8880f
--- /dev/null
+++ b/org.springframework.context/src/test/java/org/springframework/context/BeanThatListens.java
@@ -0,0 +1,61 @@
+/*
+ * 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;
+
+import java.util.Map;
+
+/**
+ * A stub {@link org.springframework.context.ApplicationListener}.
+ *
+ * @author Thomas Risberg
+ * @author Juergen Hoeller
+ */
+public class BeanThatListens implements ApplicationListener {
+
+	private BeanThatBroadcasts beanThatBroadcasts;
+
+	private int eventCount;
+
+
+	public BeanThatListens() {
+	}
+
+	public BeanThatListens(BeanThatBroadcasts beanThatBroadcasts) {
+		this.beanThatBroadcasts = beanThatBroadcasts;
+		Map beans = beanThatBroadcasts.applicationContext.getBeansOfType(BeanThatListens.class);
+		if (!beans.isEmpty()) {
+			throw new IllegalStateException("Shouldn't have found any BeanThatListens instances");
+		}
+	}
+
+
+	public void onApplicationEvent(ApplicationEvent event) {
+		eventCount++;
+		if (beanThatBroadcasts != null) {
+			beanThatBroadcasts.receivedCount++;
+		}
+	}
+
+	public int getEventCount() {
+		return eventCount;
+	}
+
+	public void zero() {
+		eventCount = 0;
+	}
+
+}
\ No newline at end of file
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/org.springframework.context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
similarity index 98%
rename from org.springframework.testsuite/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
rename to org.springframework.context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
index e7cc49e3e3..0d5dcdb0b5 100644
--- a/org.springframework.testsuite/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
+++ b/org.springframework.context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
@@ -24,6 +24,7 @@ import org.easymock.EasyMock;
 import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
 import org.junit.Test;
+import org.junit.Assert;
 
 import org.springframework.beans.FatalBeanException;
 import org.springframework.beans.factory.BeanCreationException;
@@ -173,7 +174,7 @@ public class ApplicationContextEventTests {
 
 		BeanThatBroadcasts broadcaster = (BeanThatBroadcasts) context.getBean("broadcaster");
 		context.publishEvent(new MyEvent(context));
-		assertEquals("The event was not received by the listener", 2, broadcaster.receivedCount);
+		Assert.assertEquals("The event was not received by the listener", 2, broadcaster.receivedCount);
 	}
 
 	public static class MyEvent extends ApplicationEvent {