diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/ExceptionThrowingTestHandler.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/ExceptionThrowingTestBean.java
similarity index 83%
rename from org.springframework.integration/src/test/java/org/springframework/integration/config/ExceptionThrowingTestHandler.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/ExceptionThrowingTestBean.java
index d840ef1aa1..e165d441ee 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/ExceptionThrowingTestHandler.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/ExceptionThrowingTestBean.java
@@ -16,16 +16,15 @@
 
 package org.springframework.integration.config;
 
-import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageHandlingException;
 
 /**
  * @author Mark Fisher
  */
-public class ExceptionThrowingTestHandler implements MessageHandler {
+public class ExceptionThrowingTestBean {
 
-	public Message<?> handle(Message<?> message) {
+	public void handle(Message<?> message) {
 		throw new MessageHandlingException(message, "intentional test failure");
 	}
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestConcatenatingHandler.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestConcatenatingHandler.java
deleted file mode 100644
index 78409e6428..0000000000
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestConcatenatingHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.config;
-
-import org.springframework.integration.handler.MessageHandler;
-import org.springframework.integration.message.Message;
-import org.springframework.integration.message.StringMessage;
-
-/**
- * @author Mark Fisher
- */
-public class TestConcatenatingHandler implements MessageHandler {
-
-	private String value;
-
-
-	public TestConcatenatingHandler(String value) {
-		this.value = value;
-	}
-
-
-	public Message<?> handle(Message<?> message) {
-		return new StringMessage(message.getPayload() + this.value);
-	}
-
-}
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestHandler.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestHandler.java
index 0038190cbb..bf31bb050d 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestHandler.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestHandler.java
@@ -18,14 +18,13 @@ package org.springframework.integration.config;
 
 import java.util.concurrent.CountDownLatch;
 
-import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.StringMessage;
 
 /**
  * @author Mark Fisher
  */
-public class TestHandler implements MessageHandler {
+public class TestHandler {
 
 	private String messageString;
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithErrorHandler.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithErrorHandler.xml
index dca0e59afa..8e107a7643 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithErrorHandler.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithErrorHandler.xml
@@ -11,9 +11,9 @@
 
 	<channel id="channel"/>
 
-	<service-activator id="endpoint" input-channel="channel" ref="handler" error-handler="errorHandler"/>
+	<service-activator id="endpoint" input-channel="channel" ref="testBean" error-handler="errorHandler"/>
 
-	<beans:bean id="handler" class="org.springframework.integration.config.ExceptionThrowingTestHandler"/>
+	<beans:bean id="testBean" class="org.springframework.integration.config.ExceptionThrowingTestBean"/>
 
 	<beans:bean id="errorHandler" class="org.springframework.integration.config.TestErrorHandler"/>