diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/XmppRosterEventMessageSendingHandler.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/XmppRosterEventMessageSendingHandler.java
index 69421dcbfd..f453525022 100644
--- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/XmppRosterEventMessageSendingHandler.java
+++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/XmppRosterEventMessageSendingHandler.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.integration.xmpp.outbound;
 
 import org.jivesoftware.smack.XMPPConnection;
@@ -47,4 +48,5 @@ public class XmppRosterEventMessageSendingHandler extends AbstractXmppConnection
 					+ payload.getClass().getName());
 		this.xmppConnection.sendPacket((Presence)payload);
 	}
+
 }
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppMessageDrivenEndpointTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/XmppMessageDrivenEndpointTests.java
similarity index 98%
rename from spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppMessageDrivenEndpointTests.java
rename to spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/XmppMessageDrivenEndpointTests.java
index efd444106e..ca29472c99 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppMessageDrivenEndpointTests.java
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/XmppMessageDrivenEndpointTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.xmpp.messages;
+package org.springframework.integration.xmpp.inbound;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpointTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/XmppRosterEventMessageDrivenEndpointTests.java
similarity index 99%
rename from spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpointTests.java
rename to spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/XmppRosterEventMessageDrivenEndpointTests.java
index 635130b060..db4fcf9afc 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpointTests.java
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/XmppRosterEventMessageDrivenEndpointTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.xmpp.presence;
+package org.springframework.integration.xmpp.inbound;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppMessageSendingMessageHandlerTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/XmppMessageSendingMessageHandlerTests.java
similarity index 98%
rename from spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppMessageSendingMessageHandlerTests.java
rename to spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/XmppMessageSendingMessageHandlerTests.java
index 0e68127981..ec3c2aa1fc 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppMessageSendingMessageHandlerTests.java
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/XmppMessageSendingMessageHandlerTests.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.springframework.integration.xmpp.messages;
+package org.springframework.integration.xmpp.outbound;
 
 import static junit.framework.Assert.assertNotNull;
 import static org.mockito.Mockito.mock;
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppRosterEventMessageSendingHandlerTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/XmppRosterEventMessageSendingHandlerTests.java
similarity index 97%
rename from spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppRosterEventMessageSendingHandlerTests.java
rename to spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/XmppRosterEventMessageSendingHandlerTests.java
index 5026bac6f6..484288368f 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppRosterEventMessageSendingHandlerTests.java
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/XmppRosterEventMessageSendingHandlerTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.xmpp.messages;
+package org.springframework.integration.xmpp.outbound;
 
 import static junit.framework.Assert.assertNotNull;
 import static org.mockito.Mockito.mock;