diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemReaderTests.java
index e5e0d695f..68f320949 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemReaderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemReaderTests.java
@@ -1,17 +1,22 @@
 package org.springframework.batch.item.support;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import java.util.Collection;
 
-import junit.framework.TestCase;
-
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.batch.item.ItemReader;
 
-public class AggregateItemReaderTests extends TestCase {
+public class AggregateItemReaderTests {
 
 	private ItemReader<Object> input;
 
 	private AggregateItemReader provider;
 
+	@Before
 	public void setUp() {
 		// create mock for input
 		input = new AbstractItemReader<Object>() {
@@ -39,6 +44,7 @@ public class AggregateItemReaderTests extends TestCase {
 		provider.setItemReader(input);
 	}
 
+	@Test
 	public void testNext() throws Exception {
 		// read object
 		Object result = provider.read();
diff --git a/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml b/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml
index 499ac6b31..51ee8f133 100644
--- a/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml
+++ b/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml
@@ -7,20 +7,7 @@
  		http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 	<import resource="simple-job-launcher-context.xml" />
 	
-	<!--  For Java 1.4 we need to ceate the mbean server explicitly -->
-	<bean id="mbeanServer" class="org.springframework.jmx.support.MBeanServerFactoryBean">
-		<property name="locateExistingServerIfPossible" value="true" />
-	</bean>
-	<bean id="registry" class="org.springframework.remoting.rmi.RmiRegistryFactoryBean">
-		<property name="port" value="1099" />
-	</bean>
-	<bean id="serverConnector" class="org.springframework.jmx.support.ConnectorServerFactoryBean">
-		<property name="objectName" value="connector:name=rmi" />
-		<property name="serviceUrl" value="service:jmx:rmi://localhost/jndi/rmi://localhost:1099/batch-samples" />
-		<property name="server" ref="mbeanServer" />
-	</bean>
 	<bean class="org.springframework.jmx.export.MBeanExporter">
-		<property name="server" ref="mbeanServer" />
 		<property name="beans">
 			<map>
 				<entry key="spring:service=batch,bean=jobLauncher">