diff --git a/spring-ldap/src/itest-openldap/java/conf/ldapTemplateTestContext-openldap.xml b/spring-ldap/src/itest-openldap/java/conf/ldapTemplateTestContext-openldap.xml
index adbd39e5..fb18a69d 100644
--- a/spring-ldap/src/itest-openldap/java/conf/ldapTemplateTestContext-openldap.xml
+++ b/spring-ldap/src/itest-openldap/java/conf/ldapTemplateTestContext-openldap.xml
@@ -14,7 +14,7 @@
 		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="base" value="${base}" />
-		<property name="dirObjectFactory" value="org.springframework.ldap.core.DefaultDirObjectFactory" />
+		<property name="anonymousReadOnly" value="true" />
 	</bean>
 	
 	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
diff --git a/spring-ldap/src/itest-openldap/java/org/springframework/ldap/LdapTemplatePagedSearchITest.java b/spring-ldap/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplatePagedSearchITest.java
similarity index 95%
rename from spring-ldap/src/itest-openldap/java/org/springframework/ldap/LdapTemplatePagedSearchITest.java
rename to spring-ldap/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplatePagedSearchITest.java
index afc0baf3..d49d5d9c 100644
--- a/spring-ldap/src/itest-openldap/java/org/springframework/ldap/LdapTemplatePagedSearchITest.java
+++ b/spring-ldap/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplatePagedSearchITest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap;
+package org.springframework.ldap.control;
 
 import java.util.List;
 
@@ -23,8 +23,8 @@ import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.SearchControls;
 
-import org.springframework.ldap.control.PagedResultsCookie;
-import org.springframework.ldap.control.PagedResultsRequestControl;
+import org.springframework.ldap.Person;
+import org.springframework.ldap.PersonAttributesMapper;
 import org.springframework.ldap.core.CollectingNameClassPairCallbackHandler;
 import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapTemplate;