diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/CustomConverterMessageProcessingTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/handler/CustomConverterMessageProcessingTests-context.xml
new file mode 100644
index 0000000000..76e4c512aa
--- /dev/null
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/handler/CustomConverterMessageProcessingTests-context.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
+	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+            http://www.springframework.org/schema/beans/spring-beans.xsd
+            http://www.springframework.org/schema/integration
+            http://www.springframework.org/schema/integration/spring-integration.xsd">
+
+	<service-activator input-channel="serviceActivatorChannel" ref="testService" method="test"/>
+
+	<transformer input-channel="transformerChannel" ref="testService" method="test"/>
+
+	<router input-channel="routerChannel" ref="testService" method="test"/>
+
+	<splitter input-channel="splitterChannel" ref="testService" method="test"/>
+
+	<filter input-channel="filterChannel" ref="testService" method="filter"/>
+
+	<channel id="ROUTER_TARGET_CHANNEL">
+		<queue/>
+	</channel>
+
+	<beans:bean id="testService"
+		class="org.springframework.integration.handler.CustomConverterMessageProcessingTests$TestService"/>
+
+	<beans:bean id="integrationConversionService"
+		class="org.springframework.context.support.ConversionServiceFactoryBean">
+		<beans:property name="converters">
+			<beans:bean class="org.springframework.integration.handler.CustomConverterMessageProcessingTests$TestConverter"/>
+		</beans:property>
+	</beans:bean>
+
+</beans:beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/CustomConverterMessageProcessingTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/CustomConverterMessageProcessingTests.java
new file mode 100644
index 0000000000..7f46611707
--- /dev/null
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/handler/CustomConverterMessageProcessingTests.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2002-2010 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.handler;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.integration.channel.PollableChannel;
+import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.core.Message;
+import org.springframework.integration.core.MessageChannel;
+import org.springframework.integration.message.MessageBuilder;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Mark Fisher
+ * @since 2.0
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class CustomConverterMessageProcessingTests {
+
+	@Autowired
+	private MessageChannel serviceActivatorChannel;
+
+	@Autowired
+	private MessageChannel transformerChannel;
+
+	@Autowired
+	private MessageChannel splitterChannel;
+
+	@Autowired
+	private MessageChannel filterChannel;
+
+	@Autowired
+	private MessageChannel routerChannel;
+
+	@Autowired
+	@Qualifier("ROUTER_TARGET_CHANNEL")
+	private PollableChannel routerTargetChannel;
+
+
+	@Test
+	public void serviceActivator() {
+		QueueChannel replyChannel = new QueueChannel();
+		Message<?> message = MessageBuilder.withPayload(new TestBean1("service-test"))
+				.setReplyChannel(replyChannel).build();
+		this.serviceActivatorChannel.send(message);
+		Message<?> result = replyChannel.receive(0);
+		assertNotNull(result);
+		assertNotNull(result.getPayload());
+		assertEquals(TestBean2.class, result.getPayload().getClass());
+		assertEquals("SERVICE-TEST", ((TestBean2) result.getPayload()).text);
+	}
+
+	@Test
+	public void transformer() {
+		QueueChannel replyChannel = new QueueChannel();
+		Message<?> message = MessageBuilder.withPayload(new TestBean1("transformer-test"))
+				.setReplyChannel(replyChannel).build();
+		this.transformerChannel.send(message);
+		Message<?> result = replyChannel.receive(0);
+		assertNotNull(result);
+		assertNotNull(result.getPayload());
+		assertEquals(TestBean2.class, result.getPayload().getClass());
+		assertEquals("TRANSFORMER-TEST", ((TestBean2) result.getPayload()).text);
+	}
+
+	@Test
+	public void splitter() {
+		QueueChannel replyChannel = new QueueChannel();
+		Message<?> message = MessageBuilder.withPayload(new TestBean1("splitter-test"))
+				.setReplyChannel(replyChannel).build();
+		this.splitterChannel.send(message);
+		Message<?> result = replyChannel.receive(0);
+		assertNotNull(result);
+		assertNotNull(result.getPayload());
+		assertEquals(TestBean2.class, result.getPayload().getClass());
+		assertEquals("SPLITTER-TEST", ((TestBean2) result.getPayload()).text);
+	}
+
+	@Test
+	public void filter() {
+		QueueChannel replyChannel = new QueueChannel();
+		Message<?> message = MessageBuilder.withPayload(new TestBean1("filter-test"))
+				.setReplyChannel(replyChannel).build();
+		this.filterChannel.send(message);
+		Message<?> result = replyChannel.receive(0);
+		assertNotNull(result);
+		assertNotNull(result.getPayload());
+		assertEquals(TestBean1.class, result.getPayload().getClass());
+		assertEquals("filter-test", ((TestBean1) result.getPayload()).text);
+	}
+
+	@Test
+	public void router() {
+		Message<?> message = MessageBuilder.withPayload(new TestBean1("router-test")).build();
+		this.routerChannel.send(message);
+		Message<?> result = this.routerTargetChannel.receive(0);
+		assertNotNull(result);
+		assertNotNull(result.getPayload());
+		assertEquals(TestBean1.class, result.getPayload().getClass());
+		assertEquals("router-test", ((TestBean1) result.getPayload()).text);
+	}
+
+
+	@SuppressWarnings("unused")
+	private static class TestConverter implements Converter<TestBean1, TestBean2> {
+
+		public TestBean2 convert(TestBean1 source) {
+			return new TestBean2(source.text.toUpperCase());
+		}
+	}
+
+
+	@SuppressWarnings("unused")
+	private static class TestService {
+
+		public Object test(TestBean2 bean) {
+			return bean;
+		}
+
+		public boolean filter(TestBean2 bean) {
+			return true;
+		}
+	}
+
+
+	private static class TestBean1  {
+
+		private String text;
+
+		public TestBean1(String text) {
+			this.text = text;
+		}
+	}
+
+
+	private static class TestBean2 {
+
+		private String text;
+
+		public TestBean2(String text) {
+			this.text = text;
+		}
+
+		// called by router for channel name
+		public String toString() {
+			return this.text.replace("-TEST", "_TARGET_CHANNEL");
+		}
+	}
+
+}