diff --git a/spring-integration-adapters/src/main/java/META-INF/spring.schemas b/spring-integration-adapters/src/main/java/META-INF/spring.schemas
index 9ce5496e50..00c9dc8137 100644
--- a/spring-integration-adapters/src/main/java/META-INF/spring.schemas
+++ b/spring-integration-adapters/src/main/java/META-INF/spring.schemas
@@ -1 +1,2 @@
-http\://www.springframework.org/schema/integration/spring-integration-adapters-1.0.xsd=org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd
\ No newline at end of file
+http\://www.springframework.org/schema/integration/spring-integration-adapters-1.0.xsd=org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd
+http\://www.springframework.org/schema/integration/spring-integration-1.0.xsd=org/springframework/integration/adapter/config/spring-integration-1.0.xsd
\ No newline at end of file
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/config/spring-integration-1.0.xsd b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/config/spring-integration-1.0.xsd
new file mode 100644
index 0000000000..1962fbb2a0
--- /dev/null
+++ b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/config/spring-integration-1.0.xsd
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.springframework.org/schema/integration"
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		targetNamespace="http://www.springframework.org/schema/integration"
+		elementFormDefault="qualified"
+		attributeFormDefault="unqualified">
+
+	<xsd:include schemaLocation="http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd"/>
+	<xsd:include schemaLocation="http://www.springframework.org/schema/integration/spring-integration-adapters-1.0.xsd"/>
+
+</xsd:schema>
\ No newline at end of file
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd
index 9a4603f7e1..0b83bc6d42 100644
--- a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd
+++ b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd
@@ -7,8 +7,6 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:include schemaLocation="http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"/>
-
 	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
 
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/fileTargetAdapterParserTests.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/fileTargetAdapterParserTests.xml
index f11c1f2a3c..fdd81139df 100644
--- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/fileTargetAdapterParserTests.xml
+++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/file/config/fileTargetAdapterParserTests.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-adapters-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<si:message-bus/>
 
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithConnectionFactoryAndDestination.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithConnectionFactoryAndDestination.xml
index 5b59551afc..e4d1c4bd88 100644
--- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithConnectionFactoryAndDestination.xml
+++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithConnectionFactoryAndDestination.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-adapters-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<si:message-bus/>
 
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithConnectionFactoryAndDestinationName.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithConnectionFactoryAndDestinationName.xml
index 83757edcb3..bd77ab4f12 100644
--- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithConnectionFactoryAndDestinationName.xml
+++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithConnectionFactoryAndDestinationName.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-adapters-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<si:message-bus/>
 
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithConnectionFactoryOnly.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithConnectionFactoryOnly.xml
index 7a70079776..6e70464035 100644
--- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithConnectionFactoryOnly.xml
+++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithConnectionFactoryOnly.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-adapters-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<si:message-bus/>
 
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithMessageConverter.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithMessageConverter.xml
index b00256fca4..cc52032f50 100644
--- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithMessageConverter.xml
+++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithMessageConverter.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-adapters-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<si:message-bus/>
 
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithConnectionFactoryAndDestination.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithConnectionFactoryAndDestination.xml
index a7fb9715ac..d2fb4d4f17 100644
--- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithConnectionFactoryAndDestination.xml
+++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithConnectionFactoryAndDestination.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-adapters-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<si:message-bus/>
 
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithConnectionFactoryAndDestinationName.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithConnectionFactoryAndDestinationName.xml
index b8b256a706..995a0ab5ab 100644
--- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithConnectionFactoryAndDestinationName.xml
+++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithConnectionFactoryAndDestinationName.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-adapters-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<si:message-bus/>
 
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithConnectionFactoryOnly.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithConnectionFactoryOnly.xml
index c6d68cec1b..696e2086b1 100644
--- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithConnectionFactoryOnly.xml
+++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithConnectionFactoryOnly.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-adapters-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<si:message-bus/>
 
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithDestinationNameOnly.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithDestinationNameOnly.xml
index 5d185d0ca0..e38376d143 100644
--- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithDestinationNameOnly.xml
+++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithDestinationNameOnly.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-adapters-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<si:message-bus/>
 
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithDestinationOnly.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithDestinationOnly.xml
index 508b17d074..4e2388542e 100644
--- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithDestinationOnly.xml
+++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithDestinationOnly.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-adapters-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<si:message-bus/>
 
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithJmsTemplate.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithJmsTemplate.xml
index cdcff85d11..69751ee5ea 100644
--- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithJmsTemplate.xml
+++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithJmsTemplate.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-adapters-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<si:message-bus/>
 
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithoutPollPeriod.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithoutPollPeriod.xml
index cb48b1f27d..81ae4a6423 100644
--- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithoutPollPeriod.xml
+++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/pollingAdapterWithoutPollPeriod.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-adapters-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<si:message-bus/>
 
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/targetAdapterWithConnectionFactoryAndDestination.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/targetAdapterWithConnectionFactoryAndDestination.xml
index 6dd4ebb62b..a12e4941e6 100644
--- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/targetAdapterWithConnectionFactoryAndDestination.xml
+++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/targetAdapterWithConnectionFactoryAndDestination.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-adapters-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<si:message-bus/>
 
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/targetAdapterWithConnectionFactoryAndDestinationName.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/targetAdapterWithConnectionFactoryAndDestinationName.xml
index cec70369ae..63ee27002b 100644
--- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/targetAdapterWithConnectionFactoryAndDestinationName.xml
+++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/targetAdapterWithConnectionFactoryAndDestinationName.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-adapters-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<si:message-bus/>
 
diff --git a/spring-integration-core/src/main/java/META-INF/spring.schemas b/spring-integration-core/src/main/java/META-INF/spring.schemas
index bc2146688a..756faaf80c 100644
--- a/spring-integration-core/src/main/java/META-INF/spring.schemas
+++ b/spring-integration-core/src/main/java/META-INF/spring.schemas
@@ -1 +1 @@
-http\://www.springframework.org/schema/integration/spring-integration-1.0.xsd=org/springframework/integration/config/spring-integration-1.0.xsd
\ No newline at end of file
+http\://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd=org/springframework/integration/config/spring-integration-core-1.0.xsd
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd b/spring-integration-core/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd
similarity index 100%
rename from spring-integration-core/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
rename to spring-integration-core/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/adapter/adapterTestsWithNamespace.xml b/spring-integration-core/src/test/java/org/springframework/integration/adapter/adapterTestsWithNamespace.xml
index be2881ff27..a8125fa0e8 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/adapter/adapterTestsWithNamespace.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/adapter/adapterTestsWithNamespace.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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<si:message-bus auto-startup="false"/>
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java b/spring-integration-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java
index c1d0bf6061..7e94846265 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java
@@ -161,11 +161,12 @@ public class MessageBusTests {
 		bus.start();
 		inputChannel.send(new StringMessage(1, "testing"));
 		latch.await(500, TimeUnit.MILLISECONDS);
-		Message<?> message1 = outputChannel1.receive(100);
-		Message<?> message2 = outputChannel2.receive(100);
+		assertEquals("both handlers should have been invoked", 0, latch.getCount());
+		Message<?> message1 = outputChannel1.receive(500);
+		Message<?> message2 = outputChannel2.receive(500);
 		bus.stop();
-		assertTrue("both handlers should have received and replied to the message",
-				(message1 != null && message2 != null));
+		assertNotNull("both handlers should have replied to the message", message1);
+		assertNotNull("both handlers should have replied to the message", message2);
 	}
 
 	@Test
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/channelInterceptorParserTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/channelInterceptorParserTests.xml
index f10bd1874d..85334c4bc3 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/channelInterceptorParserTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/channelInterceptorParserTests.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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<channel id="channel">
 		<interceptor ref="interceptor"/>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/channelParserTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/channelParserTests.xml
index e1fc000364..f9c8753992 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/channelParserTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/channelParserTests.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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<channel id="capacityChannel" capacity="10"/>
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/channelWithoutId.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/channelWithoutId.xml
index 8214cfb79d..310ef7600a 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/channelWithoutId.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/channelWithoutId.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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<integration:channel/>
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/endpointConcurrencyTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/endpointConcurrencyTests.xml
index c30332be5b..f64fff1024 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/endpointConcurrencyTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/endpointConcurrencyTests.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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<message-bus/>
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithErrorHandler.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithErrorHandler.xml
index 5e6d7af4a7..9122689d07 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithErrorHandler.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithErrorHandler.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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<message-bus/>
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithHandlerChainElement.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithHandlerChainElement.xml
index a0b8bb7e8e..6efcbeddc2 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithHandlerChainElement.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithHandlerChainElement.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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<message-bus/>
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithHandlerChildElement.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithHandlerChildElement.xml
index 0bea46b378..b527467757 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithHandlerChildElement.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithHandlerChildElement.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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<message-bus/>
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithReplyHandler.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithReplyHandler.xml
index f7781e4cef..68348cd01e 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithReplyHandler.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithReplyHandler.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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<message-bus/>
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithSelectors.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithSelectors.xml
index 1d94e16c4f..5b296a5fd4 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithSelectors.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithSelectors.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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<message-bus/>
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml
index eae3e29c2c..9ce14f3e9b 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<beans:bean class="org.springframework.integration.bus.MessageBus"/>
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/handlerAdapterParserTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/handlerAdapterParserTests.xml
index b15b4bcbe5..6e9148a8a9 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/handlerAdapterParserTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/handlerAdapterParserTests.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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<handler id="handlerAdapter" ref="testBean" method="store"/>
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/handlerChainParserTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/handlerChainParserTests.xml
index 492422d81e..a54c85928d 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/handlerChainParserTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/handlerChainParserTests.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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<handler-chain id="handlerChain">
 		<handler ref="handler1"/>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusElementAndBean.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusElementAndBean.xml
index d7178f4234..7f0e3ebbc9 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusElementAndBean.xml
+++ b/spring-integration-core/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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<integration:message-bus/>
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithAutoCreateChannels.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithAutoCreateChannels.xml
index 156e0432cc..45f87854ac 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithAutoCreateChannels.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithAutoCreateChannels.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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<message-bus auto-create-channels="true"/>
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithAutoStartup.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithAutoStartup.xml
index 88cf9fe4dc..2f01cea9d7 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithAutoStartup.xml
+++ b/spring-integration-core/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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<message-bus auto-startup="true"/>
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithDefaultConcurrencyTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithDefaultConcurrencyTests.xml
index fcbf760dd0..b4a24a4bb0 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithDefaultConcurrencyTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithDefaultConcurrencyTests.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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<message-bus>
 		<default-concurrency core="4" max="7"/>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithDefaults.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithDefaults.xml
index 7078e8bb35..794bf871ca 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithDefaults.xml
+++ b/spring-integration-core/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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<message-bus/>
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithErrorChannelReference.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithErrorChannelReference.xml
index 59650f6f96..ef47c73da3 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithErrorChannelReference.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithErrorChannelReference.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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<channel id="testErrorChannel"/>
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/multipleMessageBusElements.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/multipleMessageBusElements.xml
index 3ab2907afe..f2282dd234 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/multipleMessageBusElements.xml
+++ b/spring-integration-core/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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<message-bus/>
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
index 1b00328c80..dea033720e 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<beans:bean class="org.springframework.integration.bus.MessageBus"/>
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/messageParameterAnnotatedEndpointTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/messageParameterAnnotatedEndpointTests.xml
index 8103abe4a8..967694cf50 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/messageParameterAnnotatedEndpointTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/messageParameterAnnotatedEndpointTests.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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<integration:message-bus/>
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/simpleAnnotatedEndpointTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/simpleAnnotatedEndpointTests.xml
index 783e2683e3..c0e883cf6a 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/simpleAnnotatedEndpointTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/simpleAnnotatedEndpointTests.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-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
 	<bean id="bus" class="org.springframework.integration.bus.MessageBus"/>
 
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo.xml b/spring-integration-samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo.xml
index 9b358adf91..6c687b524a 100644
--- a/spring-integration-samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo.xml
+++ b/spring-integration-samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo.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-adapters-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
 	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>