diff --git a/samples/article-spring20/src/main/webapp/WEB-INF/applicationContext.xml b/samples/article-spring20/src/main/webapp/WEB-INF/applicationContext.xml
index 5331fea0..93e6fc3d 100644
--- a/samples/article-spring20/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/samples/article-spring20/src/main/webapp/WEB-INF/applicationContext.xml
@@ -15,7 +15,7 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="/WEB-INF/setup_data.ldif" />
-		<property name="port" value="3900" />
+		<property name="port" value="1888" />
 	</bean>
 
 	<bean id="ldapTemplate"
diff --git a/samples/article-spring20/src/main/webapp/WEB-INF/ldap.properties b/samples/article-spring20/src/main/webapp/WEB-INF/ldap.properties
index 8843f1f1..8ae3f6be 100644
--- a/samples/article-spring20/src/main/webapp/WEB-INF/ldap.properties
+++ b/samples/article-spring20/src/main/webapp/WEB-INF/ldap.properties
@@ -1,4 +1,4 @@
-urls=ldap://127.0.0.1:3900
+urls=ldap://127.0.0.1:1888
 userDn=uid=admin,ou=system
 password=secret
 base=dc=jayway,dc=se
diff --git a/samples/article-spring30/src/main/webapp/WEB-INF/applicationContext.xml b/samples/article-spring30/src/main/webapp/WEB-INF/applicationContext.xml
index 5331fea0..93e6fc3d 100644
--- a/samples/article-spring30/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/samples/article-spring30/src/main/webapp/WEB-INF/applicationContext.xml
@@ -15,7 +15,7 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="/WEB-INF/setup_data.ldif" />
-		<property name="port" value="3900" />
+		<property name="port" value="1888" />
 	</bean>
 
 	<bean id="ldapTemplate"
diff --git a/samples/article-spring30/src/main/webapp/WEB-INF/ldap.properties b/samples/article-spring30/src/main/webapp/WEB-INF/ldap.properties
index 8843f1f1..8ae3f6be 100644
--- a/samples/article-spring30/src/main/webapp/WEB-INF/ldap.properties
+++ b/samples/article-spring30/src/main/webapp/WEB-INF/ldap.properties
@@ -1,4 +1,4 @@
-urls=ldap://127.0.0.1:3900
+urls=ldap://127.0.0.1:1888
 userDn=uid=admin,ou=system
 password=secret
 base=dc=jayway,dc=se
diff --git a/samples/article-spring30/src/test/resources/config/ldap.properties b/samples/article-spring30/src/test/resources/config/ldap.properties
index 8843f1f1..8ae3f6be 100644
--- a/samples/article-spring30/src/test/resources/config/ldap.properties
+++ b/samples/article-spring30/src/test/resources/config/ldap.properties
@@ -1,4 +1,4 @@
-urls=ldap://127.0.0.1:3900
+urls=ldap://127.0.0.1:1888
 userDn=uid=admin,ou=system
 password=secret
 base=dc=jayway,dc=se
diff --git a/samples/article-spring30/src/test/resources/config/testContext.xml b/samples/article-spring30/src/test/resources/config/testContext.xml
index 4a762506..f21d3331 100644
--- a/samples/article-spring30/src/test/resources/config/testContext.xml
+++ b/samples/article-spring30/src/test/resources/config/testContext.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 	<bean id="placeholderConfig"
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -15,7 +15,7 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="/setup_data.ldif" />
-		<property name="port" value="3901" />
+		<property name="port" value="1888" />
 	</bean>
 	
 	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
@@ -29,7 +29,7 @@
 
 	<bean id="traditionalPersonDao"
 		class="org.springframework.ldap.samples.article.dao.TraditionalPersonDaoImpl">
-		<property name="url" value="ldap://localhost:3901" />
+		<property name="url" value="ldap://localhost:1888" />
 		<property name="base" value="dc=jayway,dc=se" />
 		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
diff --git a/samples/article/src/main/webapp/WEB-INF/applicationContext.xml b/samples/article/src/main/webapp/WEB-INF/applicationContext.xml
index 5331fea0..93e6fc3d 100644
--- a/samples/article/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/samples/article/src/main/webapp/WEB-INF/applicationContext.xml
@@ -15,7 +15,7 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="/WEB-INF/setup_data.ldif" />
-		<property name="port" value="3900" />
+		<property name="port" value="1888" />
 	</bean>
 
 	<bean id="ldapTemplate"
diff --git a/samples/article/src/main/webapp/WEB-INF/ldap.properties b/samples/article/src/main/webapp/WEB-INF/ldap.properties
index 8843f1f1..8ae3f6be 100644
--- a/samples/article/src/main/webapp/WEB-INF/ldap.properties
+++ b/samples/article/src/main/webapp/WEB-INF/ldap.properties
@@ -1,4 +1,4 @@
-urls=ldap://127.0.0.1:3900
+urls=ldap://127.0.0.1:1888
 userDn=uid=admin,ou=system
 password=secret
 base=dc=jayway,dc=se
diff --git a/samples/article/src/test/resources/config/ldap.properties b/samples/article/src/test/resources/config/ldap.properties
index 8843f1f1..8ae3f6be 100644
--- a/samples/article/src/test/resources/config/ldap.properties
+++ b/samples/article/src/test/resources/config/ldap.properties
@@ -1,4 +1,4 @@
-urls=ldap://127.0.0.1:3900
+urls=ldap://127.0.0.1:1888
 userDn=uid=admin,ou=system
 password=secret
 base=dc=jayway,dc=se
diff --git a/samples/article/src/test/resources/config/testContext.xml b/samples/article/src/test/resources/config/testContext.xml
index 4a762506..f21d3331 100644
--- a/samples/article/src/test/resources/config/testContext.xml
+++ b/samples/article/src/test/resources/config/testContext.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 	<bean id="placeholderConfig"
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -15,7 +15,7 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="/setup_data.ldif" />
-		<property name="port" value="3901" />
+		<property name="port" value="1888" />
 	</bean>
 	
 	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
@@ -29,7 +29,7 @@
 
 	<bean id="traditionalPersonDao"
 		class="org.springframework.ldap.samples.article.dao.TraditionalPersonDaoImpl">
-		<property name="url" value="ldap://localhost:3901" />
+		<property name="url" value="ldap://localhost:1888" />
 		<property name="base" value="dc=jayway,dc=se" />
 		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
diff --git a/samples/demos/demo-tiger/src/test/resources/config/ldap.properties b/samples/demos/demo-tiger/src/test/resources/config/ldap.properties
index 8843f1f1..8ae3f6be 100644
--- a/samples/demos/demo-tiger/src/test/resources/config/ldap.properties
+++ b/samples/demos/demo-tiger/src/test/resources/config/ldap.properties
@@ -1,4 +1,4 @@
-urls=ldap://127.0.0.1:3900
+urls=ldap://127.0.0.1:1888
 userDn=uid=admin,ou=system
 password=secret
 base=dc=jayway,dc=se
diff --git a/samples/demos/demo-tiger/src/test/resources/config/testContext.xml b/samples/demos/demo-tiger/src/test/resources/config/testContext.xml
index 70f38549..095a8c0e 100644
--- a/samples/demos/demo-tiger/src/test/resources/config/testContext.xml
+++ b/samples/demos/demo-tiger/src/test/resources/config/testContext.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 	<bean id="placeholderConfig"
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -14,14 +14,14 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="/config/setup_data.ldif" />
-		<property name="port" value="3900" />
+		<property name="port" value="1888" />
 	</bean>
 	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
 		<constructor-arg ref="contextSource" />
 	</bean>
 	<bean id="personDao" class="org.springframework.ldap.demo.dao.PersonDaoImpl">
 		<property name="base" value="dc=jayway,dc=se" />
-		<property name="url" value="ldap://localhost:3900" />
+		<property name="url" value="ldap://localhost:1888" />
 		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
 	</bean>
diff --git a/samples/demos/demo/src/main/java/org/springframework/ldap/demo/solution/testContext.xml b/samples/demos/demo/src/main/java/org/springframework/ldap/demo/solution/testContext.xml
index de4a1e99..2c9dd28a 100644
--- a/samples/demos/demo/src/main/java/org/springframework/ldap/demo/solution/testContext.xml
+++ b/samples/demos/demo/src/main/java/org/springframework/ldap/demo/solution/testContext.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 	<bean id="placeholderConfig"
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -14,13 +14,13 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="/config/setup_data.ldif" />
-		<property name="port" value="3900" />
+		<property name="port" value="1888" />
 	</bean>
 	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
 		<constructor-arg ref="contextSource" />
 	</bean>
 	<bean id="personDao" class="org.springframework.ldap.demo.dao.PersonDaoImpl">
-		<property name="url" value="ldap://127.0.0.1:3900" />
+		<property name="url" value="ldap://127.0.0.1:1888" />
 		<property name="base" value="dc=jayway,dc=se" />
 		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
diff --git a/samples/demos/demo/src/test/resources/config/ldap.properties b/samples/demos/demo/src/test/resources/config/ldap.properties
index 8843f1f1..8ae3f6be 100644
--- a/samples/demos/demo/src/test/resources/config/ldap.properties
+++ b/samples/demos/demo/src/test/resources/config/ldap.properties
@@ -1,4 +1,4 @@
-urls=ldap://127.0.0.1:3900
+urls=ldap://127.0.0.1:1888
 userDn=uid=admin,ou=system
 password=secret
 base=dc=jayway,dc=se
diff --git a/samples/demos/demo/src/test/resources/config/testContext.xml b/samples/demos/demo/src/test/resources/config/testContext.xml
index 70f38549..095a8c0e 100644
--- a/samples/demos/demo/src/test/resources/config/testContext.xml
+++ b/samples/demos/demo/src/test/resources/config/testContext.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 	<bean id="placeholderConfig"
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -14,14 +14,14 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="/config/setup_data.ldif" />
-		<property name="port" value="3900" />
+		<property name="port" value="1888" />
 	</bean>
 	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
 		<constructor-arg ref="contextSource" />
 	</bean>
 	<bean id="personDao" class="org.springframework.ldap.demo.dao.PersonDaoImpl">
 		<property name="base" value="dc=jayway,dc=se" />
-		<property name="url" value="ldap://localhost:3900" />
+		<property name="url" value="ldap://localhost:1888" />
 		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
 	</bean>
diff --git a/samples/samples-utils/src/test/resources/conf/ldap.properties b/samples/samples-utils/src/test/resources/conf/ldap.properties
index 8843f1f1..8ae3f6be 100644
--- a/samples/samples-utils/src/test/resources/conf/ldap.properties
+++ b/samples/samples-utils/src/test/resources/conf/ldap.properties
@@ -1,4 +1,4 @@
-urls=ldap://127.0.0.1:3900
+urls=ldap://127.0.0.1:1888
 userDn=uid=admin,ou=system
 password=secret
 base=dc=jayway,dc=se
diff --git a/samples/samples-utils/src/test/resources/conf/testContext.xml b/samples/samples-utils/src/test/resources/conf/testContext.xml
index 67b2d314..0ddf149a 100644
--- a/samples/samples-utils/src/test/resources/conf/testContext.xml
+++ b/samples/samples-utils/src/test/resources/conf/testContext.xml
@@ -12,7 +12,7 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="classpath:/setup_data.ldif" />
-		<property name="port" value="3900" />
+		<property name="port" value="1888" />
 	</bean>
 
 	<bean id="ldapTemplate"
diff --git a/test/integration-tests/src/test/resources/conf/apacheDsContext.xml b/test/integration-tests/src/test/resources/conf/apacheDsContext.xml
index 6620b80d..4502ace1 100644
--- a/test/integration-tests/src/test/resources/conf/apacheDsContext.xml
+++ b/test/integration-tests/src/test/resources/conf/apacheDsContext.xml
@@ -4,9 +4,9 @@
 	This context automatically starts the Apache Directory Server
 	and sets up the test data
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
 	<!-- Used mainly to enable injecting base into LdapServerManager -->
@@ -36,7 +36,7 @@
 		making it easier for the integration tests requiring OpenLDAP.
 	-->
 	<bean id="configuration" class="org.apache.directory.server.configuration.MutableServerStartupConfiguration">
-    	<property name="ldapPort" value="3900" />
+    	<property name="ldapPort" value="1888" />
     	<property name="contextPartitionConfigurations">
       		<set>
         		<ref bean="jaywayPartitionConfiguration"/>
diff --git a/test/integration-tests/src/test/resources/conf/ldap.properties b/test/integration-tests/src/test/resources/conf/ldap.properties
index 8843f1f1..8ae3f6be 100644
--- a/test/integration-tests/src/test/resources/conf/ldap.properties
+++ b/test/integration-tests/src/test/resources/conf/ldap.properties
@@ -1,4 +1,4 @@
-urls=ldap://127.0.0.1:3900
+urls=ldap://127.0.0.1:1888
 userDn=uid=admin,ou=system
 password=secret
 base=dc=jayway,dc=se
diff --git a/test/integration-tests/src/test/resources/conf/ldapAndHibernateTransactionTestContext.xml b/test/integration-tests/src/test/resources/conf/ldapAndHibernateTransactionTestContext.xml
index 4b4278f5..23819be6 100755
--- a/test/integration-tests/src/test/resources/conf/ldapAndHibernateTransactionTestContext.xml
+++ b/test/integration-tests/src/test/resources/conf/ldapAndHibernateTransactionTestContext.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
-
+
     <import resource="classpath:/conf/commonTestContext.xml"/>
-
-	<bean id="contextSource"
-		class="org.springframework.ldap.test.TestContextSourceFactoryBean">
-		<property name="defaultPartitionSuffix" value="dc=jayway,dc=se" />
-		<property name="defaultPartitionName" value="jayway" />
-		<property name="principal" value="${userDn}" />
-		<property name="password" value="${password}" />
-		<property name="ldifFile" value="classpath:/setup_data.ldif" />
-		<property name="port" value="3900" />
-		<property name="pooled" value="false" />
-	</bean>
+
+	<bean id="contextSource"
+		class="org.springframework.ldap.test.TestContextSourceFactoryBean">
+		<property name="defaultPartitionSuffix" value="dc=jayway,dc=se" />
+		<property name="defaultPartitionName" value="jayway" />
+		<property name="principal" value="${userDn}" />
+		<property name="password" value="${password}" />
+		<property name="ldifFile" value="classpath:/setup_data.ldif" />
+		<property name="port" value="1888" />
+		<property name="pooled" value="false" />
+	</bean>
 
 	<bean id="dataSource"
 		class="org.springframework.jdbc.datasource.DriverManagerDataSource">
@@ -29,29 +29,29 @@
 		class="org.springframework.ldap.transaction.compensating.manager.TransactionAwareContextSourceProxy">
 		<constructor-arg ref="contextSource" />
 	</bean>
-
+
 	<bean id="ldapTemplate"
 		class="org.springframework.ldap.core.LdapTemplate">
 		<constructor-arg ref="transactedContextSource" />
-	</bean>
-	
-	<bean id="hibernateTemplate" class="org.springframework.orm.hibernate3.HibernateTemplate">
-		<property name="sessionFactory" ref="sessionFactory" />
+	</bean>
+	
+	<bean id="hibernateTemplate" class="org.springframework.orm.hibernate3.HibernateTemplate">
+		<property name="sessionFactory" ref="sessionFactory" />
 	</bean>
 
-	 <bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-	    <property name="dataSource" ref="dataSource"/>
-	    <property name="mappingResources">
-	      <list>
-	        <value>conf/OrgPerson.hbm.xml</value>
-	      </list>
-	    </property>
-	    <property name="hibernateProperties">
-	      <value>
-	        hibernate.dialect=org.hibernate.dialect.HSQLDialect
-	        hibernate.hbm2ddl.auto=create
-	      </value>
-	    </property>
+	 <bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
+	    <property name="dataSource" ref="dataSource"/>
+	    <property name="mappingResources">
+	      <list>
+	        <value>conf/OrgPerson.hbm.xml</value>
+	      </list>
+	    </property>
+	    <property name="hibernateProperties">
+	      <value>
+	        hibernate.dialect=org.hibernate.dialect.HSQLDialect
+	        hibernate.hbm2ddl.auto=create
+	      </value>
+	    </property>
 	  </bean>
 	<bean id="transactionManager"
 		class="org.springframework.ldap.transaction.compensating.manager.ContextSourceAndHibernateTransactionManager">
diff --git a/test/integration-tests/src/test/resources/conf/ldapAndJdbcTransactionTestContext.xml b/test/integration-tests/src/test/resources/conf/ldapAndJdbcTransactionTestContext.xml
index 432b8c0e..68b084a4 100644
--- a/test/integration-tests/src/test/resources/conf/ldapAndJdbcTransactionTestContext.xml
+++ b/test/integration-tests/src/test/resources/conf/ldapAndJdbcTransactionTestContext.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
     <import resource="classpath:/conf/commonTestContext.xml"/>
 
-	<bean id="contextSource"
-		class="org.springframework.ldap.test.TestContextSourceFactoryBean">
-		<property name="defaultPartitionSuffix" value="dc=jayway,dc=se" />
-		<property name="defaultPartitionName" value="jayway" />
-		<property name="principal" value="${userDn}" />
-		<property name="password" value="${password}" />
-		<property name="ldifFile" value="classpath:/setup_data.ldif" />
-		<property name="port" value="3900" />
-		<property name="pooled" value="false" />
-	</bean>
+	<bean id="contextSource"
+		class="org.springframework.ldap.test.TestContextSourceFactoryBean">
+		<property name="defaultPartitionSuffix" value="dc=jayway,dc=se" />
+		<property name="defaultPartitionName" value="jayway" />
+		<property name="principal" value="${userDn}" />
+		<property name="password" value="${password}" />
+		<property name="ldifFile" value="classpath:/setup_data.ldif" />
+		<property name="port" value="1888" />
+		<property name="pooled" value="false" />
+	</bean>
 
 	<bean id="dataSource"
 		class="org.springframework.jdbc.datasource.DriverManagerDataSource">
diff --git a/test/integration-tests/src/test/resources/conf/ldapTemplateAcegiTestContext.xml b/test/integration-tests/src/test/resources/conf/ldapTemplateAcegiTestContext.xml
index a7ba9c2c..aacdab93 100644
--- a/test/integration-tests/src/test/resources/conf/ldapTemplateAcegiTestContext.xml
+++ b/test/integration-tests/src/test/resources/conf/ldapTemplateAcegiTestContext.xml
@@ -13,7 +13,7 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="classpath:/setup_data.ldif" />
-		<property name="port" value="3900" />
+		<property name="port" value="1888" />
 		<property name="authenticationSource">
 			<bean
 				class="org.springframework.ldap.authentication.AcegiAuthenticationSource" />
diff --git a/test/integration-tests/src/test/resources/conf/ldapTemplateNoBaseSuffixTestContext.xml b/test/integration-tests/src/test/resources/conf/ldapTemplateNoBaseSuffixTestContext.xml
index 312b761f..0a96139e 100644
--- a/test/integration-tests/src/test/resources/conf/ldapTemplateNoBaseSuffixTestContext.xml
+++ b/test/integration-tests/src/test/resources/conf/ldapTemplateNoBaseSuffixTestContext.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-                           http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+                           http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-    <import resource="classpath:/conf/commonTestContext.xml"/>
-	
+    <import resource="classpath:/conf/commonTestContext.xml"/>
+	
 	<bean id="contextSource"
 		class="org.springframework.ldap.test.TestContextSourceFactoryBean">
 		<property name="defaultPartitionSuffix" value="dc=jayway,dc=se" />
@@ -13,14 +13,14 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="classpath:/setup_data.ldif" />
-		<property name="port" value="3900" />
+		<property name="port" value="1888" />
 		<property name="baseOnTarget" value="false" />
 	</bean>
-	
-	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
-		<constructor-arg ref="contextSource" />
-	</bean>
-	
+	
+	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
+		<constructor-arg ref="contextSource" />
+	</bean>
+	
 	<!-- 
 	<bean id="dataLoader" class="org.ddsteps.data.excel.CachingExcelDataLoader" />
 	 -->
diff --git a/test/integration-tests/src/test/resources/conf/ldapTemplateObjectBindTestContext.xml b/test/integration-tests/src/test/resources/conf/ldapTemplateObjectBindTestContext.xml
index f67e95d5..2bb26603 100644
--- a/test/integration-tests/src/test/resources/conf/ldapTemplateObjectBindTestContext.xml
+++ b/test/integration-tests/src/test/resources/conf/ldapTemplateObjectBindTestContext.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-                           http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+                           http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-    <import resource="classpath:/conf/commonTestContext.xml"/>
+    <import resource="classpath:/conf/commonTestContext.xml"/>
 
 	<bean id="contextSource"
 		class="org.springframework.ldap.test.TestContextSourceFactoryBean">
@@ -13,7 +13,7 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="classpath:/setup_data.ldif" />
-		<property name="port" value="3900" />
+		<property name="port" value="1888" />
 		<property name="dirObjectFactory"><null/></property>
 	</bean>
 
@@ -21,4 +21,4 @@
 		class="org.springframework.ldap.core.LdapTemplate">
 		<constructor-arg ref="contextSource" />
 	</bean>
-</beans>
+</beans>
diff --git a/test/integration-tests/src/test/resources/conf/ldapTemplateTestContext.xml b/test/integration-tests/src/test/resources/conf/ldapTemplateTestContext.xml
index 3c85161c..244f5eac 100644
--- a/test/integration-tests/src/test/resources/conf/ldapTemplateTestContext.xml
+++ b/test/integration-tests/src/test/resources/conf/ldapTemplateTestContext.xml
@@ -12,7 +12,7 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="classpath:/setup_data.ldif" />
-		<property name="port" value="3900" />
+		<property name="port" value="1888" />
 	</bean>
 
 	<bean id="ldapTemplate"
diff --git a/test/integration-tests/src/test/resources/conf/ldapTemplateTransactionTestContext.xml b/test/integration-tests/src/test/resources/conf/ldapTemplateTransactionTestContext.xml
index 7c3f8026..6ea54f03 100644
--- a/test/integration-tests/src/test/resources/conf/ldapTemplateTransactionTestContext.xml
+++ b/test/integration-tests/src/test/resources/conf/ldapTemplateTransactionTestContext.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
-
+
     <import resource="classpath:/conf/commonTestContext.xml"/>
 
-	<bean id="contextSource"
-		class="org.springframework.ldap.test.TestContextSourceFactoryBean">
-		<property name="defaultPartitionSuffix" value="dc=jayway,dc=se" />
-		<property name="defaultPartitionName" value="jayway" />
-		<property name="principal" value="${userDn}" />
-		<property name="password" value="${password}" />
-		<property name="ldifFile" value="classpath:/setup_data.ldif" />
-		<property name="port" value="3900" />
-		<property name="pooled" value="false" />
-	</bean>
-
+	<bean id="contextSource"
+		class="org.springframework.ldap.test.TestContextSourceFactoryBean">
+		<property name="defaultPartitionSuffix" value="dc=jayway,dc=se" />
+		<property name="defaultPartitionName" value="jayway" />
+		<property name="principal" value="${userDn}" />
+		<property name="password" value="${password}" />
+		<property name="ldifFile" value="classpath:/setup_data.ldif" />
+		<property name="port" value="1888" />
+		<property name="pooled" value="false" />
+	</bean>
+
 	<bean id="transactedContextSource"
 		class="org.springframework.ldap.transaction.compensating.manager.TransactionAwareContextSourceProxy">
 		<constructor-arg ref="contextSource" />
diff --git a/test/integration-tests/src/test/resources/conf/rootContextSourceTestContext.xml b/test/integration-tests/src/test/resources/conf/rootContextSourceTestContext.xml
index 13cc7894..f6252e8d 100644
--- a/test/integration-tests/src/test/resources/conf/rootContextSourceTestContext.xml
+++ b/test/integration-tests/src/test/resources/conf/rootContextSourceTestContext.xml
@@ -13,7 +13,7 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="classpath:/setup_data.ldif" />
-		<property name="port" value="3900" />
+		<property name="port" value="1888" />
 		<property name="baseOnTarget" value="false" />
 	</bean>
 
diff --git a/test/integration-tests/src/test/resources/conf/simpleLdapTemplateTestContext.xml b/test/integration-tests/src/test/resources/conf/simpleLdapTemplateTestContext.xml
index b351ad52..5e526b16 100644
--- a/test/integration-tests/src/test/resources/conf/simpleLdapTemplateTestContext.xml
+++ b/test/integration-tests/src/test/resources/conf/simpleLdapTemplateTestContext.xml
@@ -12,7 +12,7 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="classpath:/setup_data.ldif" />
-		<property name="port" value="3900" />
+		<property name="port" value="1888" />
 	</bean>
 
 	<bean id="simpleLdapTemplate"