diff --git a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/ConsoleSourceParserTests.java b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/ConsoleSourceParserTests.java
index fcd7365be4..794654b105 100644
--- a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/ConsoleSourceParserTests.java
+++ b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/ConsoleSourceParserTests.java
@@ -33,8 +33,9 @@ import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.ConfigurationException;
+import org.springframework.integration.endpoint.InboundChannelAdapter;
 import org.springframework.integration.message.Message;
-import org.springframework.integration.stream.CharacterStreamSource;
+import org.springframework.integration.message.PollableSource;
 
 /**
  * @author Mark Fisher
@@ -51,8 +52,9 @@ public class ConsoleSourceParserTests {
 	public void testConsoleSourceWithDefaultCharset() {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"consoleSourceParserTests.xml", ConsoleSourceParserTests.class);
-		CharacterStreamSource source =
-				(CharacterStreamSource) context.getBean("sourceWithDefaultCharset");
+		InboundChannelAdapter adapter =
+				(InboundChannelAdapter) context.getBean("sourceWithDefaultCharset.adapter");
+		PollableSource<?> source = (PollableSource<?>) new DirectFieldAccessor(adapter).getPropertyValue("source");
 		DirectFieldAccessor sourceAccessor = new DirectFieldAccessor(source);
 		Reader bufferedReader = (Reader) sourceAccessor.getPropertyValue("reader");
 		assertEquals(BufferedReader.class, bufferedReader.getClass());
@@ -70,8 +72,9 @@ public class ConsoleSourceParserTests {
 	public void testConsoleSourceWithProvidedCharset() {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"consoleSourceParserTests.xml", ConsoleSourceParserTests.class);
-		CharacterStreamSource source =
-				(CharacterStreamSource) context.getBean("sourceWithProvidedCharset");
+		InboundChannelAdapter adapter =
+				(InboundChannelAdapter) context.getBean("sourceWithProvidedCharset.adapter");
+		PollableSource<?> source = (PollableSource<?>) new DirectFieldAccessor(adapter).getPropertyValue("source");
 		DirectFieldAccessor sourceAccessor = new DirectFieldAccessor(source);
 		Reader bufferedReader = (Reader) sourceAccessor.getPropertyValue("reader");
 		assertEquals(BufferedReader.class, bufferedReader.getClass());
diff --git a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/consoleSourceParserTests.xml b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/consoleSourceParserTests.xml
index 3476b22d84..1a007129c8 100644
--- a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/consoleSourceParserTests.xml
+++ b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/consoleSourceParserTests.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration/stream"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
+	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/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/stream
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
 
 	<stdin-channel-adapter id="sourceWithDefaultCharset"/>
 
diff --git a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/consoleTargetParserTests.xml b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/consoleTargetParserTests.xml
index 1b4227bb1a..d2bf4c0bc1 100644
--- a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/consoleTargetParserTests.xml
+++ b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/consoleTargetParserTests.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration/stream"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
+	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/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/stream
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
 
-	<channel id="testChannel"/>
+	<integration:channel id="testChannel"/>
 
 	<stdout-channel-adapter id="targetWithDefaultCharset" channel="testChannel"/>
 
diff --git a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/invalidConsoleSourceParserTests.xml b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/invalidConsoleSourceParserTests.xml
index bff6fac9d7..b70efc6f4f 100644
--- a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/invalidConsoleSourceParserTests.xml
+++ b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/invalidConsoleSourceParserTests.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration/stream"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
+	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/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/stream
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
 
 	<stdin-channel-adapter id="sourceWithInvalidCharset" charset="invalid-charset-name"/>
 
diff --git a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/invalidConsoleTargetParserTests.xml b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/invalidConsoleTargetParserTests.xml
index 0d9fe0b79a..03b7f16d98 100644
--- a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/invalidConsoleTargetParserTests.xml
+++ b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/invalidConsoleTargetParserTests.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration/stream"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
+	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/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/stream
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
 
 	<stdout-channel-adapter id="targetWithInvalidCharset" charset="invalid-charset-name"/>