diff --git a/spring-ldap/src/test/java/org/springframework/ldap/support/LdapEncoderTest.java b/spring-ldap/src/test/java/org/springframework/ldap/core/LdapEncoderTest.java
similarity index 94%
rename from spring-ldap/src/test/java/org/springframework/ldap/support/LdapEncoderTest.java
rename to spring-ldap/src/test/java/org/springframework/ldap/core/LdapEncoderTest.java
index b22d455c..09a4b942 100644
--- a/spring-ldap/src/test/java/org/springframework/ldap/support/LdapEncoderTest.java
+++ b/spring-ldap/src/test/java/org/springframework/ldap/core/LdapEncoderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support;
+package org.springframework.ldap.core;
 
 import org.springframework.ldap.BadLdapGrammarException;
 import org.springframework.ldap.core.LdapEncoder;
diff --git a/spring-ldap/src/test/java/org/springframework/ldap/support/AggregateDirContextProcessorTest.java b/spring-ldap/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTest.java
similarity index 94%
rename from spring-ldap/src/test/java/org/springframework/ldap/support/AggregateDirContextProcessorTest.java
rename to spring-ldap/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTest.java
index c54b3ed4..79b4f26f 100644
--- a/spring-ldap/src/test/java/org/springframework/ldap/support/AggregateDirContextProcessorTest.java
+++ b/spring-ldap/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support;
+package org.springframework.ldap.core.support;
 
 import javax.naming.NamingException;
 
diff --git a/spring-ldap/src/test/java/org/springframework/ldap/support/CountNameClassPairResultCallbackHandlerTest.java b/spring-ldap/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTest.java
similarity index 93%
rename from spring-ldap/src/test/java/org/springframework/ldap/support/CountNameClassPairResultCallbackHandlerTest.java
rename to spring-ldap/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTest.java
index 1d9e7dac..5c056e3a 100644
--- a/spring-ldap/src/test/java/org/springframework/ldap/support/CountNameClassPairResultCallbackHandlerTest.java
+++ b/spring-ldap/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support;
+package org.springframework.ldap.core.support;
 
 import javax.naming.directory.SearchResult;