diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/DefaultChannelParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/DefaultChannelParserTests.java
new file mode 100644
index 0000000000..345eb0daf0
--- /dev/null
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/DefaultChannelParserTests.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2002-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.channel.config;
+
+import static  org.junit.Assert.*;
+
+import org.junit.Test;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.integration.channel.MessageChannel;
+import org.springframework.integration.channel.factory.StubChannel;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class DefaultChannelParserTests {
+
+    @Test
+    public void testDefaultChannel() {
+        ApplicationContext context = new ClassPathXmlApplicationContext("defaultChannelParserTests.xml", this.getClass());
+        MessageChannel channel = (MessageChannel) context.getBean("defaultChannel");
+        assertTrue(channel instanceof StubChannel);
+    }
+
+}
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/defaultChannelParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/defaultChannelParserTests.xml
new file mode 100644
index 0000000000..4dedb67b75
--- /dev/null
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/defaultChannelParserTests.xml
@@ -0,0 +1,16 @@
+<?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"
+	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">
+
+	<message-bus channel-factory="stubChannelFactory"/>
+
+    <beans:bean id="stubChannelFactory" class="org.springframework.integration.channel.factory.StubChannelFactory"/>
+
+    <channel id="defaultChannel"/>
+    
+</beans:beans>
\ No newline at end of file
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/ChannelFactoryTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/ChannelFactoryTests.java
index 58ba6786db..fea51e9e67 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/ChannelFactoryTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/ChannelFactoryTests.java
@@ -42,7 +42,6 @@ import org.springframework.integration.channel.ThreadLocalChannel;
 import org.springframework.integration.dispatcher.DirectChannel;
 import org.springframework.integration.dispatcher.DirectChannelFactory;
 import org.springframework.integration.message.Message;
-import org.springframework.integration.message.selector.MessageSelector;
 
 /**
  * @author Marius Bogoevici
@@ -164,38 +163,4 @@ public class ChannelFactoryTests {
 	}
 
 
-	static class StubChannel extends AbstractMessageChannel {
-
-		public StubChannel(DispatcherPolicy dispatcherPolicy) {
-			super(dispatcherPolicy);
-		}
-
-		@Override
-		protected Message<?> doReceive(long timeout) {
-			return null;
-		}
-
-		@Override
-		protected boolean doSend(Message<?> message, long timeout) {
-			return false;
-		}
-
-		public List<Message<?>> clear() {
-			return null;
-		}
-
-		public List<Message<?>> purge(MessageSelector selector) {
-			return null;
-		}
-	}
-
-
-	static class StubChannelFactory extends AbstractChannelFactory {
-
-		@Override
-		protected AbstractMessageChannel createChannelInternal(DispatcherPolicy dispatcherPolicy) {
-			return new StubChannel(dispatcherPolicy);
-		}
-	}
-
 }
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/StubChannel.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/StubChannel.java
new file mode 100644
index 0000000000..3a555761e6
--- /dev/null
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/StubChannel.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2002-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.channel.factory;
+
+import java.util.List;
+
+import org.springframework.integration.channel.AbstractMessageChannel;
+import org.springframework.integration.channel.DispatcherPolicy;
+import org.springframework.integration.message.Message;
+import org.springframework.integration.message.selector.MessageSelector;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class StubChannel extends AbstractMessageChannel {
+
+	public StubChannel(DispatcherPolicy dispatcherPolicy) {
+		super(dispatcherPolicy);
+	}
+
+	@Override
+	protected Message<?> doReceive(long timeout) {
+		return null;
+	}
+
+	@Override
+	protected boolean doSend(Message<?> message, long timeout) {
+		return false;
+	}
+
+	public List<Message<?>> clear() {
+		return null;
+	}
+
+	public List<Message<?>> purge(MessageSelector selector) {
+		return null;
+	}
+	
+}
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/StubChannelFactory.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/StubChannelFactory.java
new file mode 100644
index 0000000000..0bd92d9f74
--- /dev/null
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/StubChannelFactory.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2002-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.channel.factory;
+
+import org.springframework.integration.channel.AbstractMessageChannel;
+import org.springframework.integration.channel.DispatcherPolicy;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class StubChannelFactory extends AbstractChannelFactory {
+
+    @Override
+    protected AbstractMessageChannel createChannelInternal(DispatcherPolicy dispatcherPolicy) {
+        return new StubChannel(dispatcherPolicy);
+    }
+    
+}