diff --git a/pom.xml b/pom.xml
index 711a814e9..52a0e3036 100644
--- a/pom.xml
+++ b/pom.xml
@@ -387,7 +387,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.3</version>
 				<configuration>
 					<includes>
 						<include>**/*Tests.java</include>
@@ -434,9 +433,9 @@
 				<version>1.5.4</version>
 			</dependency>
 			<dependency>
-				<groupId>org.junit</groupId>
-				<artifactId>com.springsource.org.junit</artifactId>
-				<version>4.4.0</version>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.4</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
@@ -580,6 +579,13 @@
 				<version>2.5.0</version>
 				<scope>provided</scope>
 			</dependency>
+			<dependency>
+			<!-- TODO: remove this or find a replacement in Java 5 / BRITS -->
+				<groupId>stax</groupId>
+				<artifactId>stax</artifactId>
+				<version>1.2.0</version>
+				<optional>true</optional>
+			</dependency>
 			<!-- Spring Dependencies -->
 			<dependency>
 				<groupId>org.springframework</groupId>
@@ -656,6 +662,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-report-plugin</artifactId>
+				<version>2.3</version>
 			</plugin>
 			<plugin>
 				<groupId>com.interface21.maven</groupId>
diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml
index 9b9d01ec9..3a3a130c2 100644
--- a/spring-batch-core/pom.xml
+++ b/spring-batch-core/pom.xml
@@ -43,8 +43,8 @@
 			<artifactId>com.springsource.org.easymock</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.junit</groupId>
-			<artifactId>com.springsource.org.junit</artifactId>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>
diff --git a/spring-batch-infrastructure-tests/pom.xml b/spring-batch-infrastructure-tests/pom.xml
index 5ee98316c..ddc3baa76 100644
--- a/spring-batch-infrastructure-tests/pom.xml
+++ b/spring-batch-infrastructure-tests/pom.xml
@@ -84,8 +84,8 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.junit</groupId>
-			<artifactId>com.springsource.org.junit</artifactId>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.easymock</groupId>
@@ -95,6 +95,11 @@
 			<groupId>javax.jms</groupId>
 			<artifactId>com.springsource.javax.jms</artifactId>
 		</dependency>
+		<dependency>
+			<!-- TODO: remove this or find a replacement in Java 5 / BRITS -->
+			<groupId>stax</groupId>
+			<artifactId>stax</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>com.springsource.javax.management.j2ee</artifactId>
diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml
index 4a34ff571..89cf89526 100644
--- a/spring-batch-infrastructure/pom.xml
+++ b/spring-batch-infrastructure/pom.xml
@@ -54,8 +54,8 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>org.junit</groupId>
-			<artifactId>com.springsource.org.junit</artifactId>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.easymock</groupId>
@@ -125,6 +125,11 @@
 			<groupId>javax.persistence</groupId>
 			<artifactId>com.springsource.javax.persistence</artifactId>
 		</dependency>
+		<dependency>
+			<!-- TODO: remove this or find a replacement in Java 5 / BRITS -->
+			<groupId>stax</groupId>
+			<artifactId>stax</artifactId>
+		</dependency>
 		<!-- Spring Dependencies -->
 		<dependency>
 			<groupId>org.springframework.ws</groupId>
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/util/FileUtilsTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/util/FileUtilsTests.java
index 1cb017622..547e748cb 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/util/FileUtilsTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/util/FileUtilsTests.java
@@ -152,6 +152,7 @@ public class FileUtilsTests {
 
 	@Before
 	public void setUp() throws Exception {
+		file.delete();
 		Assert.state(!file.exists());
 	}
 
diff --git a/spring-batch-integration/pom.xml b/spring-batch-integration/pom.xml
index 998f55077..fd37fd1b6 100644
--- a/spring-batch-integration/pom.xml
+++ b/spring-batch-integration/pom.xml
@@ -57,9 +57,8 @@
 			</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.junit</groupId>
-			<artifactId>com.springsource.org.junit
-			</artifactId>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>
diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml
index 43dabcd86..358eb08e6 100644
--- a/spring-batch-samples/pom.xml
+++ b/spring-batch-samples/pom.xml
@@ -34,8 +34,8 @@
 			<artifactId>com.springsource.org.easymock</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.junit</groupId>
-			<artifactId>com.springsource.org.junit</artifactId>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springmodules</groupId>