diff --git a/spring-ldap/src/test/java/org/springframework/ldap/CollectingNameClassPairCallbackHandlerTest.java b/spring-ldap/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTest.java
similarity index 94%
rename from spring-ldap/src/test/java/org/springframework/ldap/CollectingNameClassPairCallbackHandlerTest.java
rename to spring-ldap/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTest.java
index 9d53ac60..0dabc46e 100644
--- a/spring-ldap/src/test/java/org/springframework/ldap/CollectingNameClassPairCallbackHandlerTest.java
+++ b/spring-ldap/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap;
+package org.springframework.ldap.core;
 
 import java.util.List;
 
diff --git a/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateListTest.java b/spring-ldap/src/test/java/org/springframework/ldap/core/LdapTemplateListTest.java
similarity index 94%
rename from spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateListTest.java
rename to spring-ldap/src/test/java/org/springframework/ldap/core/LdapTemplateListTest.java
index b2c046b0..a357f6d8 100644
--- a/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateListTest.java
+++ b/spring-ldap/src/test/java/org/springframework/ldap/core/LdapTemplateListTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap;
+package org.springframework.ldap.core;
 
 import java.util.List;
 
@@ -29,10 +29,8 @@ import javax.naming.ldap.LdapContext;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
-import org.springframework.ldap.core.ContextMapper;
-import org.springframework.ldap.core.ContextSource;
-import org.springframework.ldap.core.LdapTemplate;
-import org.springframework.ldap.core.NameClassPairCallbackHandler;
+import org.springframework.ldap.LimitExceededException;
+import org.springframework.ldap.PartialResultException;
 
 /**
  * Unit tests for the <code>list</code> operations in {@link LdapTemplate}.
diff --git a/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateLookupTest.java b/spring-ldap/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTest.java
similarity index 94%
rename from spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateLookupTest.java
rename to spring-ldap/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTest.java
index d84f7c1f..f93b1454 100644
--- a/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateLookupTest.java
+++ b/spring-ldap/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap;
+package org.springframework.ldap.core;
 
 import javax.naming.Name;
 import javax.naming.directory.BasicAttributes;
@@ -24,12 +24,7 @@ import javax.naming.ldap.LdapContext;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
-import org.springframework.ldap.core.AttributesMapper;
-import org.springframework.ldap.core.ContextMapper;
-import org.springframework.ldap.core.ContextSource;
-import org.springframework.ldap.core.DirContextAdapter;
-import org.springframework.ldap.core.DistinguishedName;
-import org.springframework.ldap.core.LdapTemplate;
+import org.springframework.ldap.NameNotFoundException;
 
 public class LdapTemplateLookupTest extends TestCase {
 
diff --git a/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateRenameTest.java b/spring-ldap/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTest.java
similarity index 93%
rename from spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateRenameTest.java
rename to spring-ldap/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTest.java
index b8818ece..b9f82c5b 100644
--- a/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateRenameTest.java
+++ b/spring-ldap/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap;
+package org.springframework.ldap.core;
 
 import javax.naming.Name;
 import javax.naming.directory.DirContext;
@@ -23,8 +23,8 @@ import javax.naming.ldap.LdapContext;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
-import org.springframework.ldap.core.ContextSource;
-import org.springframework.ldap.core.LdapTemplate;
+import org.springframework.ldap.NameAlreadyBoundException;
+import org.springframework.ldap.UncategorizedLdapException;
 
 /**
  * Unit tests for the rename operations in the LdapTemplate class.
diff --git a/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateTest.java b/spring-ldap/src/test/java/org/springframework/ldap/core/LdapTemplateTest.java
similarity index 95%
rename from spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateTest.java
rename to spring-ldap/src/test/java/org/springframework/ldap/core/LdapTemplateTest.java
index 91ff63e8..a4bc754f 100644
--- a/spring-ldap/src/test/java/org/springframework/ldap/LdapTemplateTest.java
+++ b/spring-ldap/src/test/java/org/springframework/ldap/core/LdapTemplateTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap;
+package org.springframework.ldap.core;
 
 import java.util.List;
 
@@ -32,15 +32,9 @@ import junit.framework.TestCase;
 
 import org.easymock.AbstractMatcher;
 import org.easymock.MockControl;
-import org.springframework.ldap.core.AttributesMapper;
-import org.springframework.ldap.core.ContextExecutor;
-import org.springframework.ldap.core.ContextMapper;
-import org.springframework.ldap.core.ContextSource;
-import org.springframework.ldap.core.DirContextProcessor;
-import org.springframework.ldap.core.DistinguishedName;
-import org.springframework.ldap.core.LdapTemplate;
-import org.springframework.ldap.core.NameClassPairCallbackHandler;
-import org.springframework.ldap.core.SearchExecutor;
+import org.springframework.ldap.LimitExceededException;
+import org.springframework.ldap.NameNotFoundException;
+import org.springframework.ldap.PartialResultException;
 
 public class LdapTemplateTest extends TestCase {
 
diff --git a/spring-ldap/src/test/java/org/springframework/ldap/RequestControlMatcher.java b/spring-ldap/src/test/java/org/springframework/ldap/core/RequestControlMatcher.java
similarity index 95%
rename from spring-ldap/src/test/java/org/springframework/ldap/RequestControlMatcher.java
rename to spring-ldap/src/test/java/org/springframework/ldap/core/RequestControlMatcher.java
index b430fd96..80a06030 100644
--- a/spring-ldap/src/test/java/org/springframework/ldap/RequestControlMatcher.java
+++ b/spring-ldap/src/test/java/org/springframework/ldap/core/RequestControlMatcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap;
+package org.springframework.ldap.core;
 
 import javax.naming.ldap.Control;