diff --git a/spring-batch-integration/.classpath b/spring-batch-infrastructure-tests/.classpath
similarity index 100%
rename from spring-batch-integration/.classpath
rename to spring-batch-infrastructure-tests/.classpath
diff --git a/spring-batch-integration/.project b/spring-batch-infrastructure-tests/.project
similarity index 100%
rename from spring-batch-integration/.project
rename to spring-batch-infrastructure-tests/.project
diff --git a/spring-batch-integration/.settings/org.eclipse.jdt.core.prefs b/spring-batch-infrastructure-tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from spring-batch-integration/.settings/org.eclipse.jdt.core.prefs
rename to spring-batch-infrastructure-tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/spring-batch-integration/.settings/org.eclipse.mylyn.tasks.ui.prefs b/spring-batch-infrastructure-tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
similarity index 100%
rename from spring-batch-integration/.settings/org.eclipse.mylyn.tasks.ui.prefs
rename to spring-batch-infrastructure-tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/spring-batch-integration/.springBeans b/spring-batch-infrastructure-tests/.springBeans
similarity index 100%
rename from spring-batch-integration/.springBeans
rename to spring-batch-infrastructure-tests/.springBeans
diff --git a/spring-batch-integration/pom.xml b/spring-batch-infrastructure-tests/pom.xml
similarity index 98%
rename from spring-batch-integration/pom.xml
rename to spring-batch-infrastructure-tests/pom.xml
index 8dcc9d0c0..bb61c923e 100644
--- a/spring-batch-integration/pom.xml
+++ b/spring-batch-infrastructure-tests/pom.xml
@@ -1,9 +1,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>spring-batch-integration</artifactId>
+	<artifactId>spring-batch-infrastructure-tests</artifactId>
 	<packaging>jar</packaging>
-	<name>Integration Tests</name>
+	<name>Infrastructure Tests</name>
 	<description> Integration tests for the Spring Batch Infrastructure </description>
 	<parent>
 		<groupId>org.springframework.batch</groupId>
@@ -203,4 +203,4 @@
 	</dependencies>
 
 	<!-- Reporting: it doesn't make much sense to have clover or Jdepend reports in this project but they are included by the parent anyway. -->
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-batch-integration/spring-batch-integration/src/main/java/org/springframework/batch/container/jms/BatchMessageListenerContainer.java b/spring-batch-infrastructure-tests/spring-batch-integration/src/main/java/org/springframework/batch/container/jms/BatchMessageListenerContainer.java
similarity index 100%
rename from spring-batch-integration/spring-batch-integration/src/main/java/org/springframework/batch/container/jms/BatchMessageListenerContainer.java
rename to spring-batch-infrastructure-tests/spring-batch-integration/src/main/java/org/springframework/batch/container/jms/BatchMessageListenerContainer.java
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/container/jms/BatchMessageListenerContainer.java b/spring-batch-infrastructure-tests/src/main/java/org/springframework/batch/container/jms/BatchMessageListenerContainer.java
similarity index 100%
rename from spring-batch-integration/src/main/java/org/springframework/batch/container/jms/BatchMessageListenerContainer.java
rename to spring-batch-infrastructure-tests/src/main/java/org/springframework/batch/container/jms/BatchMessageListenerContainer.java
diff --git a/spring-batch-integration/src/site/apt/index.apt b/spring-batch-infrastructure-tests/src/site/apt/index.apt
similarity index 100%
rename from spring-batch-integration/src/site/apt/index.apt
rename to spring-batch-infrastructure-tests/src/site/apt/index.apt
diff --git a/spring-batch-integration/src/site/site.xml b/spring-batch-infrastructure-tests/src/site/site.xml
similarity index 100%
rename from spring-batch-integration/src/site/site.xml
rename to spring-batch-infrastructure-tests/src/site/site.xml
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/config/DatasourceTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/config/DatasourceTests.java
similarity index 100%
rename from spring-batch-integration/src/test/java/org/springframework/batch/config/DatasourceTests.java
rename to spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/config/DatasourceTests.java
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/config/MessagingTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/config/MessagingTests.java
similarity index 100%
rename from spring-batch-integration/src/test/java/org/springframework/batch/config/MessagingTests.java
rename to spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/config/MessagingTests.java
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerIntegrationTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerIntegrationTests.java
similarity index 100%
rename from spring-batch-integration/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerIntegrationTests.java
rename to spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerIntegrationTests.java
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerTests.java
similarity index 100%
rename from spring-batch-integration/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerTests.java
rename to spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerTests.java
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java
similarity index 100%
rename from spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java
rename to spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java
similarity index 100%
rename from spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java
rename to spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/CastorMarshallingTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/CastorMarshallingTests.java
similarity index 100%
rename from spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/CastorMarshallingTests.java
rename to spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/CastorMarshallingTests.java
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/CastorUnmarshallingTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/CastorUnmarshallingTests.java
similarity index 100%
rename from spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/CastorUnmarshallingTests.java
rename to spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/CastorUnmarshallingTests.java
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/XStreamMarshallingTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/XStreamMarshallingTests.java
similarity index 100%
rename from spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/XStreamMarshallingTests.java
rename to spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/XStreamMarshallingTests.java
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/XStreamUnmarshallingTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/XStreamUnmarshallingTests.java
similarity index 100%
rename from spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/XStreamUnmarshallingTests.java
rename to spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/XStreamUnmarshallingTests.java
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/domain/Trade.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/domain/Trade.java
similarity index 100%
rename from spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/domain/Trade.java
rename to spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/domain/Trade.java
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/jms/ExternalRetryInBatchTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/jms/ExternalRetryInBatchTests.java
similarity index 100%
rename from spring-batch-integration/src/test/java/org/springframework/batch/jms/ExternalRetryInBatchTests.java
rename to spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/jms/ExternalRetryInBatchTests.java
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/repeat/jms/AsynchronousTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/repeat/jms/AsynchronousTests.java
similarity index 100%
rename from spring-batch-integration/src/test/java/org/springframework/batch/repeat/jms/AsynchronousTests.java
rename to spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/repeat/jms/AsynchronousTests.java
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/repeat/jms/SynchronousTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/repeat/jms/SynchronousTests.java
similarity index 100%
rename from spring-batch-integration/src/test/java/org/springframework/batch/repeat/jms/SynchronousTests.java
rename to spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/repeat/jms/SynchronousTests.java
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/retry/jms/ExternalRetryTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/retry/jms/ExternalRetryTests.java
similarity index 100%
rename from spring-batch-integration/src/test/java/org/springframework/batch/retry/jms/ExternalRetryTests.java
rename to spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/retry/jms/ExternalRetryTests.java
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java
similarity index 100%
rename from spring-batch-integration/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java
rename to spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java
diff --git a/spring-batch-integration/src/test/java/org/springframework/retry/jms/SynchronousTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/retry/jms/SynchronousTests.java
similarity index 100%
rename from spring-batch-integration/src/test/java/org/springframework/retry/jms/SynchronousTests.java
rename to spring-batch-infrastructure-tests/src/test/java/org/springframework/retry/jms/SynchronousTests.java
diff --git a/spring-batch-integration/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java b/spring-batch-infrastructure-tests/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java
similarity index 100%
rename from spring-batch-integration/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java
rename to spring-batch-infrastructure-tests/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java
diff --git a/spring-batch-integration/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java b/spring-batch-infrastructure-tests/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java
similarity index 100%
rename from spring-batch-integration/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java
rename to spring-batch-infrastructure-tests/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java
diff --git a/spring-batch-integration/src/test/resources/data-source.xml b/spring-batch-infrastructure-tests/src/test/resources/data-source.xml
similarity index 100%
rename from spring-batch-integration/src/test/resources/data-source.xml
rename to spring-batch-infrastructure-tests/src/test/resources/data-source.xml
diff --git a/spring-batch-integration/src/test/resources/log4j.properties b/spring-batch-infrastructure-tests/src/test/resources/log4j.properties
similarity index 100%
rename from spring-batch-integration/src/test/resources/log4j.properties
rename to spring-batch-infrastructure-tests/src/test/resources/log4j.properties
diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/io/oxm/expected-output.xml b/spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/io/oxm/expected-output.xml
similarity index 100%
rename from spring-batch-integration/src/test/resources/org/springframework/batch/io/oxm/expected-output.xml
rename to spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/io/oxm/expected-output.xml
diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/io/oxm/input.xml b/spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/io/oxm/input.xml
similarity index 100%
rename from spring-batch-integration/src/test/resources/org/springframework/batch/io/oxm/input.xml
rename to spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/io/oxm/input.xml
diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/io/oxm/mapping-castor.xml b/spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/io/oxm/mapping-castor.xml
similarity index 100%
rename from spring-batch-integration/src/test/resources/org/springframework/batch/io/oxm/mapping-castor.xml
rename to spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/io/oxm/mapping-castor.xml
diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/jms/destroy.sql b/spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/jms/destroy.sql
similarity index 100%
rename from spring-batch-integration/src/test/resources/org/springframework/batch/jms/destroy.sql
rename to spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/jms/destroy.sql
diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/jms/init.sql b/spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/jms/init.sql
similarity index 100%
rename from spring-batch-integration/src/test/resources/org/springframework/batch/jms/init.sql
rename to spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/jms/init.sql
diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/jms/jms-context.xml b/spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/jms/jms-context.xml
similarity index 100%
rename from spring-batch-integration/src/test/resources/org/springframework/batch/jms/jms-context.xml
rename to spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/jms/jms-context.xml