diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/ArgumentArrayMessageMapperFromMessageTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/ArgumentArrayMessageMapperFromMessageTests.java
similarity index 97%
rename from org.springframework.integration/src/test/java/org/springframework/integration/message/ArgumentArrayMessageMapperFromMessageTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/handler/ArgumentArrayMessageMapperFromMessageTests.java
index 8193aa62c0..b4196dd6ef 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/message/ArgumentArrayMessageMapperFromMessageTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/handler/ArgumentArrayMessageMapperFromMessageTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.message;
+package org.springframework.integration.handler;
 
 import static org.junit.Assert.*;
 
@@ -29,6 +29,9 @@ import org.springframework.integration.annotation.Header;
 import org.springframework.integration.annotation.Headers;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.handler.ArgumentArrayMessageMapper;
+import org.springframework.integration.message.MessageBuilder;
+import org.springframework.integration.message.MessageHandlingException;
+import org.springframework.integration.message.StringMessage;
 
 /**
  * @author Mark Fisher
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/ArgumentArrayMessageMapperInitializationTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/ArgumentArrayMessageMapperInitializationTests.java
similarity index 97%
rename from org.springframework.integration/src/test/java/org/springframework/integration/message/ArgumentArrayMessageMapperInitializationTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/handler/ArgumentArrayMessageMapperInitializationTests.java
index dda2427d37..d8d8fbf75e 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/message/ArgumentArrayMessageMapperInitializationTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/handler/ArgumentArrayMessageMapperInitializationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.message;
+package org.springframework.integration.handler;
 
 import java.lang.reflect.Method;
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/ArgumentArrayMessageMapperToMessageTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/ArgumentArrayMessageMapperToMessageTests.java
similarity index 98%
rename from org.springframework.integration/src/test/java/org/springframework/integration/message/ArgumentArrayMessageMapperToMessageTests.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/handler/ArgumentArrayMessageMapperToMessageTests.java
index d6389f6fb7..306131577b 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/message/ArgumentArrayMessageMapperToMessageTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/handler/ArgumentArrayMessageMapperToMessageTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.message;
+package org.springframework.integration.handler;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -29,6 +29,7 @@ import org.springframework.integration.annotation.Header;
 import org.springframework.integration.annotation.Headers;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.handler.ArgumentArrayMessageMapper;
+import org.springframework.integration.message.MessageBuilder;
 
 /**
  * @author Mark Fisher