diff --git a/archetypes/simple-cli/pom.xml b/archetypes/simple-cli/pom.xml
index d8d056cec..166f6d2d7 100644
--- a/archetypes/simple-cli/pom.xml
+++ b/archetypes/simple-cli/pom.xml
@@ -56,9 +56,9 @@
 	</profiles>
 	<dependencies>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.4</version>
+			<groupId>org.junit</groupId>
+			<artifactId>com.springsource.org.junit</artifactId>
+			<version>4.4.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/dictionary.txt b/dictionary.txt
index 0cfb115fb..99434db95 100644
--- a/dictionary.txt
+++ b/dictionary.txt
@@ -83,4 +83,5 @@ fallback
 idempotent
 reconstitute
 async
+stash
 submitter
diff --git a/pom.xml b/pom.xml
index f6ec702c6..2b4585d98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -396,6 +396,7 @@
 					<excludes>
 						<exclude>**/Abstract*.java</exclude>
 					</excludes>
+					<junitArtifactName>org.junit:com.springsource.org.junit</junitArtifactName>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -432,13 +433,9 @@
 				<version>1.5.4</version>
 			</dependency>
 			<dependency>
-				<!--
-					Don't use the com.springsource one - surefire is broken in some
-					strange way
-				-->
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.4</version>
+				<groupId>org.junit</groupId>
+				<artifactId>com.springsource.org.junit</artifactId>
+				<version>4.4.0</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml
index 8a81e28be..8c0f9f330 100644
--- a/spring-batch-core/pom.xml
+++ b/spring-batch-core/pom.xml
@@ -48,8 +48,8 @@
 			<artifactId>com.springsource.org.easymock</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
+			<groupId>org.junit</groupId>
+			<artifactId>com.springsource.org.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 036dc9ebb..cbb27915e 100644
--- a/spring-batch-infrastructure-tests/pom.xml
+++ b/spring-batch-infrastructure-tests/pom.xml
@@ -89,8 +89,8 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
+			<groupId>org.junit</groupId>
+			<artifactId>com.springsource.org.junit</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.easymock</groupId>
diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml
index 4c47be80b..1d7280ebc 100644
--- a/spring-batch-infrastructure/pom.xml
+++ b/spring-batch-infrastructure/pom.xml
@@ -54,8 +54,8 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
+			<groupId>org.junit</groupId>
+			<artifactId>com.springsource.org.junit</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.easymock</groupId>
diff --git a/spring-batch-integration/pom.xml b/spring-batch-integration/pom.xml
index e9679d12a..4167e5be8 100644
--- a/spring-batch-integration/pom.xml
+++ b/spring-batch-integration/pom.xml
@@ -66,8 +66,8 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
+			<groupId>org.junit</groupId>
+			<artifactId>com.springsource.org.junit</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.log4j</groupId>
diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml
index b89827dba..4c0bf9a28 100644
--- a/spring-batch-samples/pom.xml
+++ b/spring-batch-samples/pom.xml
@@ -39,8 +39,8 @@
 			<artifactId>com.springsource.org.easymock</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
+			<groupId>org.junit</groupId>
+			<artifactId>com.springsource.org.junit</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springmodules</groupId>
diff --git a/spring-batch-test/pom.xml b/spring-batch-test/pom.xml
index 77d156bac..6d113e84f 100755
--- a/spring-batch-test/pom.xml
+++ b/spring-batch-test/pom.xml
@@ -21,8 +21,8 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
+			<groupId>org.junit</groupId>
+			<artifactId>com.springsource.org.junit</artifactId>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>