diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/ClassPathXmlJobRegistryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/ClassPathXmlJobRegistryTests.java
index 286842f1e..aa9415bde 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/ClassPathXmlJobRegistryTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/ClassPathXmlJobRegistryTests.java
@@ -1,10 +1,9 @@
 package org.springframework.batch.core.configuration.support;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 
 import org.junit.Test;
 import org.springframework.batch.core.Job;
@@ -18,54 +17,54 @@ import org.springframework.core.io.Resource;
  * 
  * 
  * @author Lucas Ward
- *
+ * 
  */
 public class ClassPathXmlJobRegistryTests {
 
-	ClassPathXmlJobRegistry registry;
-	
+	private ClassPathXmlJobRegistry registry = new ClassPathXmlJobRegistry();
+
 	@Test
-	public void testLocateJob() throws Exception{
-		
-		List<Resource> jobPaths = new ArrayList<Resource>();
-		jobPaths.add(new ClassPathResource("org/springframework/batch/core/launch/support/job.xml"));
-		jobPaths.add(new ClassPathResource("org/springframework/batch/core/launch/support/job2.xml"));
-		
-		registry = new ClassPathXmlJobRegistry(jobPaths);
+	public void testLocateJob() throws Exception {
+
+		Resource[] jobPaths = new Resource[] {
+				new ClassPathResource("org/springframework/batch/core/launch/support/job.xml"),
+				new ClassPathResource("org/springframework/batch/core/launch/support/job2.xml") };
+
+		registry.setJobPaths(jobPaths);
 		GenericApplicationContext applicationContext = new GenericApplicationContext();
 		applicationContext.refresh();
 		registry.setApplicationContext(applicationContext);
 		registry.afterPropertiesSet();
-		
+
 		Collection<String> names = registry.getJobNames();
 		assertEquals(2, names.size());
 		assertTrue(names.contains("test-job"));
 		assertTrue(names.contains("test-job2"));
-		
+
 		Job job = registry.getJob("test-job");
 		assertEquals("test-job", job.getName());
 		job = registry.getJob("test-job2");
 		assertEquals("test-job2", job.getName());
 	}
-	
-	@Test(expected=NoSuchJobException.class)
-	public void testNoJobFound() throws Exception{
-		
-		List<Resource> jobPaths = new ArrayList<Resource>();
-		jobPaths.add(new ClassPathResource("org/springframework/batch/core/launch/support/test-environment.xml"));
-		registry = new ClassPathXmlJobRegistry(jobPaths);
+
+	@Test(expected = NoSuchJobException.class)
+	public void testNoJobFound() throws Exception {
+
+		Resource[] jobPaths = new Resource[] { new ClassPathResource(
+				"org/springframework/batch/core/launch/support/test-environment.xml") };
+		registry.setJobPaths(jobPaths);
 		GenericApplicationContext applicationContext = new GenericApplicationContext();
 		applicationContext.refresh();
 		registry.setApplicationContext(applicationContext);
 		registry.afterPropertiesSet();
 	}
-	
-	@Test(expected=DuplicateJobException.class)
-	public void testDuplicateJobsInFile() throws Exception{
-		
-		List<Resource> jobPaths = new ArrayList<Resource>();
-		jobPaths.add(new ClassPathResource("org/springframework/batch/core/launch/support/2jobs.xml"));
-		registry = new ClassPathXmlJobRegistry(jobPaths);
+
+	@Test(expected = DuplicateJobException.class)
+	public void testDuplicateJobsInFile() throws Exception {
+
+		Resource[] jobPaths = new Resource[] { new ClassPathResource(
+				"org/springframework/batch/core/launch/support/2jobs.xml") };
+		registry.setJobPaths(jobPaths);
 		GenericApplicationContext applicationContext = new GenericApplicationContext();
 		applicationContext.refresh();
 		registry.setApplicationContext(applicationContext);