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 310ef7600a..35ba492e8f 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
@@ -5,8 +5,8 @@
 	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-core-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<integration:channel/>
-
+
 </beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/threadLocalChannelParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/threadLocalChannelParserTests.xml
index e577e3a503..f14e9d6f11 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/threadLocalChannelParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/threadLocalChannelParserTests.xml
@@ -5,7 +5,7 @@
 	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-core-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<thread-local-channel id="channel"/>
 
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 b4eac91aba..3ebdca8455 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
@@ -5,7 +5,7 @@
 	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-core-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<channel id="channel"/>
 
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 635d315b3b..8f8c19a4ab 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
@@ -5,7 +5,7 @@
 	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-core-1.0.xsd
+			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">
 
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 79c7a8ce24..2d331be11f 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
@@ -5,7 +5,7 @@
 	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-core-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 				
 	<message-bus/>
 	
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 789f480b67..df085f48ab 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
@@ -5,7 +5,7 @@
 	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-core-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.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 f6429a06fc..0aaa5c1ed1 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
@@ -5,7 +5,7 @@
 	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-core-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 			
 	<message-bus/>		
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusElementAndBean.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusElementAndBean.xml
index a362291c5a..280425ecce 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusElementAndBean.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusElementAndBean.xml
@@ -5,7 +5,7 @@
 	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-core-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<integration:message-bus/>
 
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 681f25c01f..7ef5bf54a1 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
@@ -5,7 +5,7 @@
 	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-core-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<message-bus configure-async-event-multicaster="true"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAutoStartup.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAutoStartup.xml
index 2f01cea9d7..88cf9fe4dc 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAutoStartup.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAutoStartup.xml
@@ -5,7 +5,7 @@
 	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-core-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<message-bus auto-startup="true"/>
 
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 35558fd505..71e3274fcb 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
@@ -5,7 +5,7 @@
 	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-core-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<message-bus/>
     
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 16687fb51a..7281542157 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
@@ -5,7 +5,7 @@
 	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-core-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<channel id="errorChannel"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithInterceptors.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithInterceptors.xml
index 5243828f0d..60f48d2f36 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithInterceptors.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithInterceptors.xml
@@ -5,7 +5,7 @@
 	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-core-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<message-bus auto-startup="false">
 		 <interceptor ref="startInterceptor"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithMessageBusAware.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithMessageBusAware.xml
index 9bbd01c608..07683716a1 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithMessageBusAware.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithMessageBusAware.xml
@@ -5,7 +5,7 @@
 	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-core-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<message-bus/>
 
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 9f6cee3e01..e0ea8c1c91 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
@@ -5,7 +5,7 @@
 	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-core-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<message-bus task-scheduler="testScheduler"/>
 
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 763f811cc1..c3c2428e11 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
@@ -5,7 +5,7 @@
 	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-core-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<message-bus configure-async-event-multicaster="false"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/multipleMessageBusElements.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/multipleMessageBusElements.xml
index f2282dd234..3ab2907afe 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/multipleMessageBusElements.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/multipleMessageBusElements.xml
@@ -5,7 +5,7 @@
 	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-core-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<message-bus/>
 
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 82cfca48bb..2c9ac5d629 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
@@ -5,7 +5,7 @@
 	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-core-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<publish-subscribe-channel id="defaultChannel"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/selectorChainParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/selectorChainParserTests.xml
index 681db829c2..769e40f09c 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/selectorChainParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/selectorChainParserTests.xml
@@ -5,7 +5,7 @@
 	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-core-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<selector-chain id="selectorChain">
 		<selector ref="selector1"/>