diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/messageBusTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/bus/messageBusTests.xml
index 6656eeef47..c7468ea49d 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/messageBusTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/messageBusTests.xml
@@ -16,7 +16,7 @@
 		<property name="outputChannel" ref="targetChannel"/>
 	</bean>
 
-	<bean id="handler" class="org.springframework.integration.handler.TestHandlers" factory-method="echoHandler"/>
+	<bean id="handler" class="org.springframework.integration.message.TestHandlers" factory-method="echoHandler"/>
 
 	<bean class="org.springframework.integration.bus.MessageBusAwareBeanPostProcessor">
 		<constructor-arg ref="bus"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/SimpleDispatcherTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/SimpleDispatcherTests.java
index 867f2394ac..bbbff0a741 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/SimpleDispatcherTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/SimpleDispatcherTests.java
@@ -28,12 +28,12 @@ import org.junit.Test;
 
 import org.springframework.integration.endpoint.AbstractMessageHandlingEndpoint;
 import org.springframework.integration.endpoint.ServiceActivatorEndpoint;
-import org.springframework.integration.handler.TestHandlers;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageConsumer;
 import org.springframework.integration.message.MessageDeliveryException;
 import org.springframework.integration.message.MessageRejectedException;
 import org.springframework.integration.message.StringMessage;
+import org.springframework.integration.message.TestHandlers;
 import org.springframework.integration.message.selector.MessageSelector;
 
 /**
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/CorrelationIdTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java
similarity index 99%
rename from org.springframework.integration/src/test/java/org/springframework/integration/handler/CorrelationIdTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java
index dac71a8bd1..abb2112aee 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/handler/CorrelationIdTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.handler;
+package org.springframework.integration.endpoint;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java
index a8bef339af..6a5e249118 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java
@@ -32,13 +32,13 @@ import org.springframework.integration.bus.DefaultMessageBus;
 import org.springframework.integration.channel.ChannelRegistry;
 import org.springframework.integration.channel.DefaultChannelRegistry;
 import org.springframework.integration.channel.QueueChannel;
-import org.springframework.integration.handler.TestHandlers;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.MessageHandlingException;
 import org.springframework.integration.message.MessageRejectedException;
 import org.springframework.integration.message.MessagingException;
 import org.springframework.integration.message.StringMessage;
+import org.springframework.integration.message.TestHandlers;
 import org.springframework.integration.message.selector.MessageSelector;
 import org.springframework.integration.message.selector.MessageSelectorChain;
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/filter/MessageFilterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/filter/FilterEndpointTests.java
similarity index 98%
rename from org.springframework.integration/src/test/java/org/springframework/integration/filter/MessageFilterTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/filter/FilterEndpointTests.java
index 24b19791e5..bfe322cf3f 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/filter/MessageFilterTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/filter/FilterEndpointTests.java
@@ -33,7 +33,7 @@ import org.springframework.integration.message.selector.MessageSelector;
 /**
  * @author Mark Fisher
  */
-public class MessageFilterTests {
+public class FilterEndpointTests {
 
 	@Test
 	public void filterAcceptsMessage() {
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/TestSink.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/TestSink.java
deleted file mode 100644
index ae65ac84ff..0000000000
--- a/org.springframework.integration/src/test/java/org/springframework/integration/handler/TestSink.java
+++ /dev/null
@@ -1,45 +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.handler;
-
-/**
- * @author Mark Fisher
- */
-public class TestSink {
-
-	private String result;
-
-
-	public void validMethod(String s) {
-	}
-
-	public void invalidMethodWithNoArgs() {
-	}
-
-	public String methodWithReturnValue(String s) {
-		return "value";
-	}
-
-	public void store(String s) {
-		this.result = s;
-	}
-
-	public String get() {
-		return this.result;
-	}
-
-}
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/TestSource.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/TestSource.java
deleted file mode 100644
index 41d4bec4ac..0000000000
--- a/org.springframework.integration/src/test/java/org/springframework/integration/handler/TestSource.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2002-2007 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;
-
-/**
- * @author Mark Fisher
- */
-public class TestSource {
-
-	public String validMethod() {
-		return "valid";
-	}
-
-	public String invalidMethodWithArg(String arg) {
-		return "invalid";
-	}
-
-	public void invalidMethodWithNoReturnValue() {
-	}
-
-	public String foo() {
-		return "foo";
-	}
-
-}
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java
index 7e2066563a..85b3080f27 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java
@@ -31,12 +31,6 @@ import org.springframework.integration.ConfigurationException;
 import org.springframework.integration.bus.DefaultMessageBus;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.endpoint.ServiceActivatorEndpoint;
-import org.springframework.integration.handler.TestSink;
-import org.springframework.integration.message.GenericMessage;
-import org.springframework.integration.message.Message;
-import org.springframework.integration.message.MessagingException;
-import org.springframework.integration.message.MethodInvokingConsumer;
-import org.springframework.integration.message.StringMessage;
 
 /**
  * @author Mark Fisher
@@ -103,7 +97,7 @@ public class MethodInvokingConsumerTests {
 	}
 
 
-	public static class TestBean {
+	private static class TestBean {
 
 		private BlockingQueue<String> queue;
 
@@ -121,4 +115,30 @@ public class MethodInvokingConsumerTests {
 		}
 	}
 
+
+	private static class TestSink {
+
+		private String result;
+
+
+		public void validMethod(String s) {
+		}
+
+		public void invalidMethodWithNoArgs() {
+		}
+
+		public String methodWithReturnValue(String s) {
+			return "value";
+		}
+
+		public void store(String s) {
+			this.result = s;
+		}
+
+		public String get() {
+			return this.result;
+		}
+
+	}
+
 }
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/TestHandlers.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/TestHandlers.java
similarity index 97%
rename from org.springframework.integration/src/test/java/org/springframework/integration/handler/TestHandlers.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/message/TestHandlers.java
index 07e112c454..d1c01bad64 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/handler/TestHandlers.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/TestHandlers.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.handler;
+package org.springframework.integration.message;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;