diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java
new file mode 100644
index 0000000000..0ab29bf010
--- /dev/null
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java
@@ -0,0 +1,111 @@
+/*
+ * 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.router.config;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayInputStream;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.integration.channel.PollableChannel;
+import org.springframework.integration.core.Message;
+import org.springframework.integration.message.MessageBuilder;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Oleg Zhurakousky
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class PayloadTypeRouterParserTests {
+	@Autowired
+	private ConfigurableApplicationContext context;
+	@Autowired
+	private TestService testService;
+	
+	@Test
+	public void testPayloadTypeRouter() {
+		context.start();
+		MessageBuilder channel1MessageBuilder = MessageBuilder.withPayload("Hello");
+		Message message1 = channel1MessageBuilder.build();
+		MessageBuilder channel2MessageBuilder = MessageBuilder.withPayload(25);
+		Message message2 = channel2MessageBuilder.build();
+		testService.foo(message1);
+		testService.foo(message2);
+		PollableChannel chanel1 = (PollableChannel) context.getBean("channel1");
+		PollableChannel chanel2 = (PollableChannel) context.getBean("channel2");
+		assertTrue(chanel1.receive().getPayload() instanceof String);
+		assertTrue(chanel2.receive().getPayload() instanceof Integer);	
+	}
+	
+	@Test(expected=BeanDefinitionStoreException.class)
+	public void testFakeTypes(){
+		ByteArrayInputStream stream = new ByteArrayInputStream(routerConfigFakeType.getBytes());
+		GenericApplicationContext ac = new GenericApplicationContext();
+		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(ac);
+		reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD);
+		reader.loadBeanDefinitions(new InputStreamResource(stream));
+	}
+	
+	@Test(expected=BeanDefinitionStoreException.class)
+	public void testNoMappingElement(){
+		ByteArrayInputStream stream = new ByteArrayInputStream(routerConfigNoMaping.getBytes());
+		GenericApplicationContext ac = new GenericApplicationContext();
+		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(ac);
+		reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD);
+		reader.loadBeanDefinitions(new InputStreamResource(stream));
+	}
+	
+	private String routerConfigFakeType = 
+		"<?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-1.0.xsd\">" +
+		"   <channel id=\"routingChannel\" />" +
+		"   <payload-type-router input-channel=\"routingChannel\">" +
+		"	   <mapping type=\"FAKE_TYPE\" channel=\"channel1\" />" +
+		"  </payload-type-router>" +
+	    "</beans:beans>";
+	
+	private String routerConfigNoMaping = 
+		"<?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-1.0.xsd\">" +
+		"   <channel id=\"routingChannel\" />" +
+		"   <payload-type-router input-channel=\"routingChannel\"/>" +
+	    "</beans:beans>";
+
+	
+	public static interface TestService{
+		public void foo(Message message);
+	}
+}