diff --git a/spring-batch-infrastructure/ivy.xml b/spring-batch-infrastructure/ivy.xml
index 8a3058ac9..6bd6306af 100644
--- a/spring-batch-infrastructure/ivy.xml
+++ b/spring-batch-infrastructure/ivy.xml
@@ -40,7 +40,8 @@
 		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="optional->runtime,provided"/>
 		<dependency org="org.springframework.ws" name="org.springframework.oxm" rev="1.5.5.A" conf="optional->runtime,provided"/>
 		<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.6.A" conf="optional->runtime,provided"/>
-		<dependency org="org.springframework" name="org.springframework.context.support" rev="2.5.6.A" conf="compile->runtime,provided"/>
+		<dependency org="org.springframework" name="org.springframework.context.support" rev="2.5.6.A" conf="optional->runtime,provided"/>
+		<dependency org="org.springframework" name="org.springframework.context.support" rev="2.5.6.A" conf="optional->runtime,provided"/>
 		<dependency org="org.springframework" name="org.springframework.core" rev="2.5.6.A" conf="compile->runtime,provided"/>
 		<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.A" conf="optional->runtime,provided"/>
 		<dependency org="org.springframework" name="org.springframework.jms" rev="2.5.6.A" conf="optional->runtime,provided"/>
diff --git a/spring-batch-test/ivy.xml b/spring-batch-test/ivy.xml
index 97323777b..cb28bfd34 100644
--- a/spring-batch-test/ivy.xml
+++ b/spring-batch-test/ivy.xml
@@ -21,7 +21,7 @@
 		<dependency org="org.springframework.batch" name="org.springframework.batch.core" rev="latest.integration"
 			conf="compile->runtime,provided" />
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="compile->runtime,provided" />
-		<dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.A" conf="test->runtime,provided" />
+		<dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.A" conf="compile->runtime,provided" />
 		<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.A" conf="compile->runtime,provided" />
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.io" rev="1.4.0"
 			conf="compile->runtime,provided" />
diff --git a/spring-batch-test/template.mf b/spring-batch-test/template.mf
index b5fca4d18..8287064be 100644
--- a/spring-batch-test/template.mf
+++ b/spring-batch-test/template.mf
@@ -24,11 +24,11 @@ Import-Template:
  org.springframework.beans.*;version="[2.5.5, 4.0.0)";resolution:=optional,
  org.springframework.core.*;version="[2.5.5, 4.0.0)";resolution:=optional,
  org.springframework.dao.*;version="[2.5.5, 4.0.0)";resolution:=optional,
+ org.springframework.test.*;version="[2.5.5, 4.0.0)";resolution:=optional,
  org.springframework.context.*;version="[2.5.5, 4.0.0)";resolution:=optional,
  org.springframework.jdbc.*;version="[2.5.5, 4.0.0)";resolution:=optional,
  org.springframework.jms.*;version="[2.5.5, 4.0.0)";resolution:=optional,
  org.springframework.orm.*;version="[2.5.5, 4.0.0)";resolution:=optional,
- org.springframework.test.*;version="[2.5.5, 4.0.0)";resolution:=optional,
  org.springframework.transaction.*;version="[2.5.5, 4.0.0)";resolution:=optional,
  org.springframework.util.*;version="[2.5.5, 4.0.0)";resolution:=optional,
  org.springframework.validation.*;version="[2.5.5, 4.0.0)";resolution:=optional,