diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests-context.xml
index b600373a94..89578eadbc 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests-context.xml
@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<annotation-config />
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests-context.xml
index 804cb231d4..416df66f4c 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests-context.xml
@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<annotation-config />
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests-context.xml
index 4bf3e4fc59..a82bc143a7 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests-context.xml
@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"
 	xmlns:util="http://www.springframework.org/schema/util">
 
 	<channel id="noLoadBalancerNoFailover" >
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelWithCustomQueueParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelWithCustomQueueParserTests-context.xml
index 11912de4e9..06ced4a690 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelWithCustomQueueParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelWithCustomQueueParserTests-context.xml
@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="customQueueChannel">
 		<queue ref="queue" />
@@ -13,7 +13,5 @@
 	<beans:bean id="queue" class="java.util.concurrent.ArrayBlockingQueue">
 		<beans:constructor-arg value="2" />
 	</beans:bean>
-	
-	
 
 </beans:beans>
\ No newline at end of file
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/DispatchingChannelParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/DispatchingChannelParserTests-context.xml
index fc6ff39c62..c3144d15cf 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/DispatchingChannelParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/DispatchingChannelParserTests-context.xml
@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="dispatcherAttribute" dispatcher="failover"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests-context.xml
index 1723cb1030..96954094f7 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<thread-local-channel id="simpleChannel"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelInterceptorParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelInterceptorParserTests.xml
index c0526001cb..5ff14b01b0 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelInterceptorParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelInterceptorParserTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="channelWithInterceptorRef">
 		<queue capacity="5"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelParserTests.xml
index 265167434c..03ae820db5 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelParserTests.xml
@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="capacityChannel">
 		<queue capacity="10" />
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelWithoutId.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelWithoutId.xml
index 35ba492e8f..b3c0852e30 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelWithoutId.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelWithoutId.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:integration="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<integration:channel/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/dispatcherAttributeAndSubElement.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/dispatcherAttributeAndSubElement.xml
index 42b6366132..30c3e048b4 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/dispatcherAttributeAndSubElement.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/dispatcherAttributeAndSubElement.xml
@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="dispatcherAttributeAndSubElement" dispatcher="failover">
 		<dispatcher/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/priorityChannelParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/priorityChannelParserTests.xml
index 0f9d1d023a..fd8d30ab19 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/priorityChannelParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/priorityChannelParserTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="priorityChannelWithDefaultComparator">
 		<priority-queue capacity="10"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/rendezvousChannelParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/rendezvousChannelParserTests.xml
index c21b08d999..835833d9a4 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/rendezvousChannelParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/rendezvousChannelParserTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="channel">
 		<rendezvous-queue/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/directChannelParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/directChannelParserTests.xml
index 3ebdca8455..be034c0e12 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/directChannelParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/directChannelParserTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="channel"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorWithCorrelationStrategyTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorWithCorrelationStrategyTests-context.xml
index 05c7c0300b..5a0099c9a6 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorWithCorrelationStrategyTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorWithCorrelationStrategyTests-context.xml
@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
     <beans:bean id="correlationStrategy" class="org.springframework.integration.config.AggregatorWithCorrelationStrategyTests$FirstLetterCorrelationStrategy"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/ChainParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/ChainParserTests-context.xml
index 6291982e14..bf5be3c20b 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/ChainParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/ChainParserTests-context.xml
@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="pollableInput">
 		<queue />
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml
index 15c0cbe13d..9510341478 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml
@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/FilterParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/FilterParserTests-context.xml
index 9a7caa48cb..79fa610dfc 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/FilterParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/FilterParserTests-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="adapterOutput">
 		<queue capacity="1"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/RouterFactoryBeanDelegationTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/RouterFactoryBeanDelegationTests-context.xml
index 66349c6a6e..9fdff832d3 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/RouterFactoryBeanDelegationTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/RouterFactoryBeanDelegationTests-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:si="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<si:channel id="input"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/SelectorChainParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/SelectorChainParserTests-context.xml
index dcac583abe..422be9c7eb 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/SelectorChainParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/SelectorChainParserTests-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<selector-chain id="selectorChain">
 		<selector ref="selector1"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/aggregatorParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/aggregatorParserTests.xml
index 12e75f7229..158191439f 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/aggregatorParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/aggregatorParserTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="outputChannel">
 		<queue capacity="5"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests-context.xml
index 35b427cdb5..054b17cf1e 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<annotation-config/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorAopIntegrationTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorAopIntegrationTests-context.xml
index b40b274165..696740f5bd 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorAopIntegrationTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorAopIntegrationTests-context.xml
@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+		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">
 
 	<annotation-config />
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/messageParameterAnnotatedEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/messageParameterAnnotatedEndpointTests.xml
index 0e63231cd6..da477ddc25 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/messageParameterAnnotatedEndpointTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/messageParameterAnnotatedEndpointTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:integration="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<integration:annotation-config/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/serviceActivatorAnnotationPostProcessorTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/serviceActivatorAnnotationPostProcessorTests.xml
index 8f53ef9ae2..5ccb3386bc 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/serviceActivatorAnnotationPostProcessorTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/serviceActivatorAnnotationPostProcessorTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<annotation-config/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml
index c130b2ccd1..85660a3fad 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:integration="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<integration:annotation-config/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/testAnnotatedAggregator.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/testAnnotatedAggregator.xml
index fa003e12d4..ab679273ca 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/testAnnotatedAggregator.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/testAnnotatedAggregator.xml
@@ -3,11 +3,11 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/context
-			http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+			http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<annotation-config/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml
index a8aed54c2f..40cc548e3a 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:integration="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<integration:annotation-config/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/completionStrategyMethodWithMissingReference.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/completionStrategyMethodWithMissingReference.xml
index 48f5050073..1294e2a21f 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/completionStrategyMethodWithMissingReference.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/completionStrategyMethodWithMissingReference.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 				
 	<aggregator id="aggregator" ref="adderBean" method="add" completion-strategy="testCompletionStrategy"
 		input-channel="input-channel" output-channel="replyChannel">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/correlationStrategyWithVoidMethods.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/correlationStrategyWithVoidMethods.xml
index 3947188915..c7fb88f332 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/correlationStrategyWithVoidMethods.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/correlationStrategyWithVoidMethods.xml
@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
     <beans:bean id="correlationStrategy" class="org.springframework.integration.config.CorrelationStrategyInvalidConfigurationTests$VoidReturningCorrelationStrategy"/>
 
@@ -20,12 +20,10 @@
         <queue capacity="10"/>
     </channel>
 
-
     <aggregator ref="aggregator"
                 completion-strategy="completionStrategy"
                 correlation-strategy="correlationStrategy" completion-strategy-method="invalidCorrelationMethod"
                 input-channel="inputChannel"
                 output-channel="outputChannel"/>
     
-
 </beans:beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/invalidCompletionStrategyMethod.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/invalidCompletionStrategyMethod.xml
index df085f48ab..b88c91628a 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/invalidCompletionStrategyMethod.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/invalidCompletionStrategyMethod.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<aggregator id="aggregatorWithPojoCompletionStrategy"
 		completion-strategy="completionStrategy"
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/invalidMethodNameAggregator.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/invalidMethodNameAggregator.xml
index f98240ff4f..fd3f42e57b 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/invalidMethodNameAggregator.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/invalidMethodNameAggregator.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 			
 	<channel id="inputChannel"/>
 	<channel id="replyChannel"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAsyncEventMulticaster.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAsyncEventMulticaster.xml
index acd0720778..8857f305e9 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAsyncEventMulticaster.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAsyncEventMulticaster.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<application-event-multicaster/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithDefaults.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithDefaults.xml
index c61fd4cdc8..a5cd9c1a0c 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithDefaults.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithDefaults.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="test"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithErrorChannel.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithErrorChannel.xml
index e399b88e06..72f8efaa33 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithErrorChannel.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithErrorChannel.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="errorChannel"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithTaskScheduler.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithTaskScheduler.xml
index 88a46d15a4..6c8b8c717c 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithTaskScheduler.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithTaskScheduler.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="test"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithoutAsyncEventMulticaster.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithoutAsyncEventMulticaster.xml
index 9a39c07d9e..f4c10f8738 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithoutAsyncEventMulticaster.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithoutAsyncEventMulticaster.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="test"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/publishSubscribeChannelParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/publishSubscribeChannelParserTests.xml
index 7a8808eb84..82a940ef99 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/publishSubscribeChannelParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/publishSubscribeChannelParserTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<publish-subscribe-channel id="defaultChannel"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/resequencerParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/resequencerParserTests.xml
index 3a5a51e521..9bf8624b39 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/resequencerParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/resequencerParserTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="inputChannel"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
index 19573b403b..120a6ba36f 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="testChannel">
 		<queue capacity="50"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/wireTapParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/wireTapParserTests.xml
index a4879a54f8..4534a21fc8 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/wireTapParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/wireTapParserTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="wireTapChannel">
 		<queue capacity="1"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/BridgeParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/BridgeParserTests-context.xml
index 4726dfa9a7..aee679e7a1 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/BridgeParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/BridgeParserTests-context.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<!-- pollable to subscribable -->
 	<channel id="pollableChannel">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ConstructorAutowireTest-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ConstructorAutowireTest-context.xml
index 77d49ea5bd..cb18e4db72 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ConstructorAutowireTest-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ConstructorAutowireTest-context.xml
@@ -3,9 +3,12 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:b="http://www.springframework.org/schema/beans"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-    		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
-    		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+	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/context
+    		http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<context:annotation-config />
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests-child.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests-child.xml
index c1ec03c885..eb58bfaf54 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests-child.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests-child.xml
@@ -2,8 +2,10 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
-	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-1.0.xsd">
+	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">
 
 	<channel id="output">
 		<queue/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests-parent.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests-parent.xml
index 6c34793c6a..772896960c 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests-parent.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests-parent.xml
@@ -2,8 +2,10 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
-	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-1.0.xsd">
+	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">
 
 	<channel id="input"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessorTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessorTests-context.xml
index b25ccd7290..aeb8ce9803 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessorTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessorTests-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<!-- triggers bootstrapping of the post-processor -->
 	<channel id="test"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/DelayerParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/DelayerParserTests-context.xml
index a3afc15a29..c8169d81ef 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/DelayerParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/DelayerParserTests-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/DelayerUsageTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/DelayerUsageTests-context.xml
index c717a1a4de..e475cdf8c5 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/DelayerUsageTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/DelayerUsageTests-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="inputA"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests-context.xml
index 2ddb3cd25a..e6049b7872 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests-context.xml
@@ -2,10 +2,13 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"
-	xmlns:util="http://www.springframework.org/schema/util">
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/util
+			http://www.springframework.org/schema/util/spring-util.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<util:properties id="testConfigurations" location="classpath:org/springframework/integration/config/xml/innerdefaware.properties"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingOutboundChannelAdapterParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingOutboundChannelAdapterParserTests-context.xml
index 0a3c4c72f2..1023262f06 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingOutboundChannelAdapterParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingOutboundChannelAdapterParserTests-context.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-2.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="channel"/>
 	
@@ -23,5 +24,7 @@
             <interval-trigger interval="20" /> 
         </poller> 
 	</outbound-channel-adapter>
+
 	<thread-pool-task-executor id="executor" core-size="5" /> 
+
 </beans:beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests-context.xml
index 9e6b886660..746bc915e7 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests-context.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<selector-chain id="selector">
 		<selector ref="someBean" method="accept" />
 	</selector-chain>
+
 	<beans:bean id="someBean"
 		class="org.springframework.integration.config.xml.MethodInvokingSelectorParserTests$SomeClass" />
+
 </beans:beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ObjectToStringTransformerParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ObjectToStringTransformerParserTests-context.xml
index e515d9feb7..a3d6c75617 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ObjectToStringTransformerParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/ObjectToStringTransformerParserTests-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="directInput"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/OrderedHandlersTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/OrderedHandlersTests-context.xml
index 99ff6778ae..880e962332 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/OrderedHandlersTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/OrderedHandlersTests-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="channel"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests-context.xml
index e5267e1dae..8d53ce85ad 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="directInput"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests-context.xml
index 7e8e94e5ec..128f6ea1f5 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="directInput"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/defaultPollerWithId.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/defaultPollerWithId.xml
index b3eb26ceb6..0fa35c7858 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/defaultPollerWithId.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/defaultPollerWithId.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<poller id="defaultPollerWithId" default="true">
 		<interval-trigger interval="5000"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/defaultPollerWithoutId.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/defaultPollerWithoutId.xml
index c66114030a..8b06e0f03c 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/defaultPollerWithoutId.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/defaultPollerWithoutId.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<poller default="true">
 		<interval-trigger interval="5000"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/gatewayParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/gatewayParserTests.xml
index b9a73ebcd7..c6b64624ae 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/gatewayParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/gatewayParserTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="requestChannel">
 		<queue capacity="100"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties
index 771f61bc04..ea07eb36bb 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties
@@ -3,9 +3,9 @@ splitter-inner-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="2" /> \
@@ -19,9 +19,9 @@ splitter-inner-success-with-poller=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"> \
 		<queue capacity="2" /> \
 	</channel> \
@@ -41,9 +41,9 @@ splitter-inner-success-with-poller-reversed-order=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"> \
 		<queue capacity="2" /> \
 	</channel> \
@@ -63,9 +63,9 @@ splitter-ref-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="2" /> \
@@ -78,9 +78,9 @@ splitter-failure-refAndBean=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="2" /> \
@@ -95,9 +95,9 @@ transformer-inner-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="1" /> \
@@ -111,9 +111,9 @@ transformer-ref-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="1" /> \
@@ -126,9 +126,9 @@ transformer-failure-refAndBean=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="1" /> \
@@ -143,9 +143,9 @@ router-inner-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="channel1"> \
 		<queue capacity="1" /> \
@@ -162,9 +162,9 @@ router-ref-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="channel1"> \
 		<queue capacity="1" /> \
@@ -180,9 +180,9 @@ router-failure-refAndBean=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<router id="testRouter" ref="testRouterBean" input-channel="inChannel" method="route"> \
 		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestRouter" /> \
@@ -194,9 +194,9 @@ sa-inner-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="1" /> \
@@ -210,9 +210,9 @@ sa-ref-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="1" /> \
@@ -225,9 +225,9 @@ sa-failure-refAndBean=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="1" /> \
@@ -242,9 +242,9 @@ aggregator-inner-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="5" /> \
@@ -258,9 +258,9 @@ aggregator-ref-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"> \
 	</channel> \
 	<channel id="outChannel"> \
@@ -274,9 +274,9 @@ aggregator-inner-concurrent-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"> \
 		<queue capacity="5" /> \
 	</channel> \
@@ -296,9 +296,9 @@ aggregator-inner-concurrent-success-reorder-bean-poller=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"> \
 		<queue capacity="5" /> \
 	</channel> \
@@ -318,9 +318,9 @@ aggregator-failure-refAndBean=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="5" /> \
@@ -335,9 +335,9 @@ filter-inner-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="1" /> \
@@ -351,9 +351,9 @@ filter-ref-success=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="1"/> \
@@ -366,9 +366,9 @@ filter-failure-refAndBean=\
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd \
+			http://www.springframework.org/schema/beans/spring-beans.xsd \
 			http://www.springframework.org/schema/integration \
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"/> \
 	<channel id="outChannel"> \
 		<queue capacity="1"/> \
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/multipleDefaultPollers.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/multipleDefaultPollers.xml
index bdad6c1f93..9273edb8c1 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/multipleDefaultPollers.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/multipleDefaultPollers.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<poller id="defaultPoller1" default="true">
 		<interval-trigger interval="3000"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/pollerWithAdviceChain.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/pollerWithAdviceChain.xml
index 8e40db5414..7d6dc1680d 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/pollerWithAdviceChain.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/pollerWithAdviceChain.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<poller id="poller">
 		<interval-trigger interval="5000"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/pollerWithReceiveTimeout.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/pollerWithReceiveTimeout.xml
index 70eedd6ccb..b8ee2498f3 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/pollerWithReceiveTimeout.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/pollerWithReceiveTimeout.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<poller id="poller" receive-timeout="1234">
 		<interval-trigger interval="5" time-unit="SECONDS"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/propertyplaceholder/PropertyPlaceholderTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/propertyplaceholder/PropertyPlaceholderTests-context.xml
index 1d565c430c..0124acad2d 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/propertyplaceholder/PropertyPlaceholderTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/propertyplaceholder/PropertyPlaceholderTests-context.xml
@@ -5,13 +5,13 @@
 	xmlns:stream="http://www.springframework.org/schema/integration/stream"
 	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-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/context
-			http://www.springframework.org/schema/context/spring-context-2.5.xsd
+			http://www.springframework.org/schema/context/spring-context.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/stream
-			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
 
 	<channel id="something">
 		<queue capacity="${capacity}" />
@@ -21,6 +21,8 @@
 		class="org.springframework.integration.config.xml.propertyplaceholder.PropertyPlaceholderTests$SanityCheck">
 		<beans:constructor-arg value="${capacity}" />
 	</beans:bean>
+
 	<context:property-placeholder
 		location="org/springframework/integration/config/xml/propertyplaceholder/channel.properties" />
+
 </beans:beans>
\ No newline at end of file
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/topLevelPollerWithoutId.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/topLevelPollerWithoutId.xml
index 62cbc8ddcf..18ff48f018 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/topLevelPollerWithoutId.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/topLevelPollerWithoutId.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<poller>
 		<interval-trigger interval="3000"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml
index 1115b70362..8cd004d885 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input">
 		<queue capacity="1"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml
index 56defabfae..5700856390 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input">
 		<queue capacity="1"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml
index fb04cf40d9..6a334d6e45 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input">
 		<queue capacity="1"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml
index 18308604ea..f42ad90785 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input">
 		<queue capacity="1"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml
index e591406322..f3bb30d005 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input">
 		<queue capacity="1"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/transactionTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/transactionTests.xml
index 769d4951c8..845e32d3eb 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/transactionTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/transactionTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="badInput">
 		<queue capacity="1"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/pollingEndpointErrorHandlingTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/pollingEndpointErrorHandlingTests.xml
index 3d0237b459..172782b162 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/pollingEndpointErrorHandlingTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/pollingEndpointErrorHandlingTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:si="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<si:channel id="errorChannel">
 		<si:queue capacity="10"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml
index 01c197d28e..db55873a1d 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:si="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<si:poller id="poller" default="true">
 		<si:interval-trigger interval="50"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/filter/filterContextTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/filter/filterContextTests.xml
index b985edfb17..bd3edc2350 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/filter/filterContextTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/filter/filterContextTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml
index 1dc2291b7e..f607a73934 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="requestChannel"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml
index a59e9eef69..a91704f6d6 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="requestChannel"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/HeaderValueRouterParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/HeaderValueRouterParserTests-context.xml
index 17d6fc2b78..accf74f125 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/HeaderValueRouterParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/HeaderValueRouterParserTests-context.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="channel1">
 		<queue capacity="1" />
@@ -29,6 +30,5 @@
 	<gateway id="testServiceB"
 		service-interface="org.springframework.integration.router.config.HeaderValueRouterParserTests$TestServiceB"
 		default-request-channel="routingChannelB" />
-		
 	
 </beans:beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests-context.xml
index dcac275560..8711ac0c22 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests-context.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="channel1">
 		<queue capacity="1" />
@@ -22,4 +23,5 @@
 	<gateway id="testService"
 		service-interface="org.springframework.integration.router.config.PayloadTypeRouterParserTests$TestService"
 		default-request-channel="routingChannel" />
+
 </beans:beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/RecipientListRouterParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/RecipientListRouterParserTests-context.xml
index 0bee1976d4..6bffffdf0b 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/RecipientListRouterParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/RecipientListRouterParserTests-context.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="channel1">
 		<queue capacity="1" />
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/routerParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/routerParserTests.xml
index 9169862474..5d9334a51f 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/routerParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/routerParserTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterAggregatorTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterAggregatorTests.xml
index 877b082bcb..3950d94cc1 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterAggregatorTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterAggregatorTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="numbers"/>
 	<channel id="splits"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterParserTests.xml
index b714130a11..190a41014b 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterParserTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="output">
 		<queue capacity="10"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-context.xml
index 2c3f043e1c..52f0660aae 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-context.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans 
-		http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+		http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/integration
-		http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+		http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<annotation-config/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/transformerContextTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/transformerContextTests.xml
index 2185a213dd..5679865023 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/transformerContextTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/transformerContextTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input"/>