diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterTest.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterTest.xml
index 508218053c..abda0d6883 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterTest.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterTest.xml
@@ -9,12 +9,13 @@
 			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/jdbc
 			http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd">
-	
-	<si:message-history/>
-	
-	<inbound-channel-adapter id="jdbcAdapter" query="select * from item where status=2" channel="target" 
-			data-source="dataSource" />
-		
+
 	<beans:import  resource="jdbcInboundChannelAdapterCommonConfig.xml" />
 
+	<si:message-history/>
+
+	<inbound-channel-adapter id="jdbcAdapter" query="select * from item where status=2" channel="target"
+			data-source="dataSource" />
+
+
 </beans:beans>
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterWithNestedUpdateTest.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterWithNestedUpdateTest.xml
index 2fad9c6c8b..c0a69efd3c 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterWithNestedUpdateTest.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterWithNestedUpdateTest.xml
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration/jdbc"
 	xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:si="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/jdbc
 			http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd">
 
+	<beans:import  resource="jdbcInboundChannelAdapterCommonConfig.xml" />
+
 	<inbound-channel-adapter channel="target" data-source="dataSource">
 		<query>select * from item where status=2</query>
 		<update>update item set status=10 where id in (:id)</update>
 	</inbound-channel-adapter>
 
-	<beans:import  resource="jdbcInboundChannelAdapterCommonConfig.xml" />
 
 </beans:beans>
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterWithUpdateTest.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterWithUpdateTest.xml
index 9624a3f507..4977235074 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterWithUpdateTest.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterWithUpdateTest.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration/jdbc"
 	xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:si="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/jdbc
 			http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd">
 
-	<inbound-channel-adapter query="select * from item where status=2" channel="target" 
-		data-source="dataSource" update="update item set status=10 where id in (:id)" />
-
 	<beans:import  resource="jdbcInboundChannelAdapterCommonConfig.xml" />
 
+	<inbound-channel-adapter query="select * from item where status=2" channel="target"
+		data-source="dataSource" update="update item set status=10 where id in (:id)" />
+
 </beans:beans>
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingNoAutoStartupJdbcInboundChannelAdapterTest.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingNoAutoStartupJdbcInboundChannelAdapterTest.xml
index 0a123f1d50..cc5b5f9d97 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingNoAutoStartupJdbcInboundChannelAdapterTest.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingNoAutoStartupJdbcInboundChannelAdapterTest.xml
@@ -6,10 +6,11 @@
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration/jdbc
 			http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd">
-	
-	<inbound-channel-adapter id="jdbcAdapter" query="select * from item where status=2" channel="target" 
-			data-source="dataSource" auto-startup="#{systemProperties['autostart']?:false}"/>
-		
+
 	<beans:import  resource="jdbcInboundChannelAdapterCommonConfig.xml" />
 
+	<inbound-channel-adapter id="jdbcAdapter" query="select * from item where status=2" channel="target"
+			data-source="dataSource" auto-startup="#{systemProperties['autostart']?:false}"/>
+
+
 </beans:beans>
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingWithJdbcOperationsJdbcInboundChannelAdapterTest.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingWithJdbcOperationsJdbcInboundChannelAdapterTest.xml
index 9542f957e0..64b7146b9e 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingWithJdbcOperationsJdbcInboundChannelAdapterTest.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingWithJdbcOperationsJdbcInboundChannelAdapterTest.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration/jdbc"
-	xmlns:beans="http://www.springframework.org/schema/beans" xmlns:si="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			 xmlns:beans="http://www.springframework.org/schema/beans"
+			 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			 xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
-			http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/jdbc
 			http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd">
 
-	<inbound-channel-adapter query="select * from item where status=2"
-		channel="target" jdbc-operations="jdbcTemplate" />
+	<beans:import resource="jdbcInboundChannelAdapterCommonConfig.xml"/>
+
+	<inbound-channel-adapter query="select * from item where status=2"
+							 channel="target" jdbc-operations="jdbcTemplate"/>
 
-	<beans:import  resource="jdbcInboundChannelAdapterCommonConfig.xml" />
 
 </beans:beans>
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingWithMaxRowsJdbcInboundChannelAdapterTest.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingWithMaxRowsJdbcInboundChannelAdapterTest.xml
index de513871f8..dcd23111fa 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingWithMaxRowsJdbcInboundChannelAdapterTest.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingWithMaxRowsJdbcInboundChannelAdapterTest.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration/jdbc"
-	xmlns:beans="http://www.springframework.org/schema/beans" xmlns:si="http://www.springframework.org/schema/integration"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/jdbc
 			http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd">
 
+	<beans:import resource="jdbcInboundChannelAdapterCommonConfig.xml" />
+
 	<inbound-channel-adapter query="select * from item where status=2"
 		channel="target" data-source="dataSource" max-rows-per-poll="2"
 		update="update item set status=10 where id in (:id)" />
 
-	<beans:import resource="jdbcInboundChannelAdapterCommonConfig.xml" />
 
 </beans:beans>
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingWithParameterSourceJdbcInboundChannelAdapterTest.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingWithParameterSourceJdbcInboundChannelAdapterTest.xml
index bbf4dc51d9..07d4e3b097 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingWithParameterSourceJdbcInboundChannelAdapterTest.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingWithParameterSourceJdbcInboundChannelAdapterTest.xml
@@ -1,32 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration/jdbc" xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:si="http://www.springframework.org/schema/integration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans:beans xmlns="http://www.springframework.org/schema/integration/jdbc"
+			 xmlns:beans="http://www.springframework.org/schema/beans"
+			 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			 xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
-			http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/jdbc
 			http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd">
 
-	<inbound-channel-adapter query="select * from item where status=2" channel="target"
-		update="update item set status=1, name=:name where id in (:id)" jdbc-operations="jdbcTemplate"
-		update-sql-parameter-source-factory="sqlParameterSourceFactory" />
+	<beans:import resource="jdbcInboundChannelAdapterCommonConfig.xml"/>
 
-	<beans:import resource="jdbcInboundChannelAdapterCommonConfig.xml" />
-
-	<beans:bean id="sqlParameterSourceFactory" class="org.springframework.integration.jdbc.ExpressionEvaluatingSqlParameterSourceFactory">
+	<beans:bean id="sqlParameterSourceFactory"
+				class="org.springframework.integration.jdbc.ExpressionEvaluatingSqlParameterSourceFactory">
 		<beans:property name="parameterExpressions">
 			<beans:map>
-				<beans:entry key="name" value="'bar'.toUpperCase()" />
+				<beans:entry key="name" value="'bar'.toUpperCase()"/>
 			</beans:map>
 		</beans:property>
 		<beans:property name="staticParameters">
 			<beans:map>
-				<beans:entry key="foo" value="bar" />
+				<beans:entry key="foo" value="bar"/>
 			</beans:map>
 		</beans:property>
 	</beans:bean>
 
+	<inbound-channel-adapter query="select * from item where status=2" channel="target"
+							 update="update item set status=1, name=:name where id in (:id)"
+							 jdbc-operations="jdbcTemplate"
+							 update-sql-parameter-source-factory="sqlParameterSourceFactory"/>
+
 </beans:beans>
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingWithParametersForMapJdbcInboundChannelAdapterTest.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingWithParametersForMapJdbcInboundChannelAdapterTest.xml
index 30d76d9295..dd2c7eece3 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingWithParametersForMapJdbcInboundChannelAdapterTest.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingWithParametersForMapJdbcInboundChannelAdapterTest.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration/jdbc"
 	xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:si="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/jdbc
 			http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd">
-	
-	<inbound-channel-adapter query="select * from item where status=:status" channel="target" 
-			data-source="dataSource" select-sql-parameter-source="parameterSource"/>
-		
+
 	<beans:import  resource="jdbcInboundChannelAdapterCommonConfig.xml" />
-	
-	<beans:bean id="parameterSource" class="org.springframework.integration.jdbc.config.JdbcPollingChannelAdapterParserTests$TestSqlParameterSource"/>
+
+	<beans:bean id="parameterSource"
+				class="org.springframework.integration.jdbc.config.JdbcPollingChannelAdapterParserTests$TestSqlParameterSource"/>
+
+	<inbound-channel-adapter query="select * from item where status=:status" channel="target"
+			data-source="dataSource" select-sql-parameter-source="parameterSource"/>
+
 
 </beans:beans>
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingWithSelectParameterSourceJdbcInboundChannelAdapterTest.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingWithSelectParameterSourceJdbcInboundChannelAdapterTest.xml
index b9226ce284..6151964b0b 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingWithSelectParameterSourceJdbcInboundChannelAdapterTest.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/pollingWithSelectParameterSourceJdbcInboundChannelAdapterTest.xml
@@ -7,11 +7,12 @@
 			http://www.springframework.org/schema/integration/jdbc
 			http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd">
 
+	<beans:import resource="jdbcInboundChannelAdapterCommonConfig.xml"/>
+
 	<inbound-channel-adapter query="select * from item where status=:status" channel="target"
 							 data-source="dataSource" select-sql-parameter-source="parameterSource"
 							 update="delete from item"/>
 
-	<beans:import resource="jdbcInboundChannelAdapterCommonConfig.xml"/>
 
 	<beans:bean id="parameterSource" factory-bean="parameterSourceFactory"
 				factory-method="createParameterSourceNoCache">