diff --git a/spring-integration-xmpp/pom.xml b/spring-integration-xmpp/pom.xml
index 6d6b03b372..75c1a1b978 100644
--- a/spring-integration-xmpp/pom.xml
+++ b/spring-integration-xmpp/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>spring-integration-parent</artifactId>
         <version>2.0.0.BUILD-SNAPSHOT</version>
     </parent>
-    <groupId>org.springframework.integration</groupId>
     <artifactId>spring-integration-xmpp</artifactId>
     <packaging>jar</packaging>
     <name>Spring Integration XMPP Support</name>
diff --git a/spring-integration-xmpp/src/test/resources/org/springframework/integration/xmpp/messages/OutboundXmppEndpointTests-context.xml b/spring-integration-xmpp/src/test/resources/org/springframework/integration/xmpp/messages/OutboundXmppEndpointTests-context.xml
index 9c988b3fb8..90e0792466 100644
--- a/spring-integration-xmpp/src/test/resources/org/springframework/integration/xmpp/messages/OutboundXmppEndpointTests-context.xml
+++ b/spring-integration-xmpp/src/test/resources/org/springframework/integration/xmpp/messages/OutboundXmppEndpointTests-context.xml
@@ -26,13 +26,7 @@
 
     <context:component-scan base-package="org.springframework.integration.xmpp"/>
 
-    <beans:bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" p:ignoreUnresolvablePlaceholders="false">
-        <beans:property name="location">
-            <beans:bean class="org.springframework.core.io.FileSystemResource">
-                <beans:constructor-arg value="#{ systemProperties['user.home'] }/Desktop/test.properties"/>
-            </beans:bean>
-        </beans:property>
-    </beans:bean>
+    <context:property-placeholder location="file://${user.home}/Desktop/test.properties" ignore-unresolvable="true"/>
 
     <beans:bean id="xmppProducer" class="org.springframework.integration.xmpp.messages.XmppMessageProducer" p:recipient="${user.2.login}"/>