diff --git a/mvn-build/integration-tests-openldap/src/test/resources/conf/ldap.properties b/mvn-build/integration-tests-openldap/src/test/resources/conf/ldap.properties
index 29b38fbb..fee074ac 100644
--- a/mvn-build/integration-tests-openldap/src/test/resources/conf/ldap.properties
+++ b/mvn-build/integration-tests-openldap/src/test/resources/conf/ldap.properties
@@ -1,3 +1,4 @@
+itest.openldap.serverAddress=127.0.0.1
 userDn=cn=admin,dc=jayway,dc=se
 password=secret
 base=dc=jayway,dc=se
diff --git a/mvn-build/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext.xml b/mvn-build/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext.xml
index bb5b9bd4..5965e369 100644
--- a/mvn-build/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext.xml
+++ b/mvn-build/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext.xml
@@ -6,6 +6,7 @@
 
 	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 		<property name="location" value="/conf/ldap.properties" />
+		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
 	</bean>
 
 	<bean id="contextSource"
@@ -13,7 +14,7 @@
 		<property name="base" value="dc=jayway,dc=se" />
 		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
-		<property name="url" value="ldap://${serverAddress}:389" />
+		<property name="url" value="ldap://${itest.openldap.serverAddress}:389" />
 	</bean>
 
 	<bean id="ldapTemplate"