diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java
index 5d1590d1..e36f7158 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java
@@ -25,7 +25,7 @@ import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationData
 import org.apache.archiva.redback.policy.PasswordEncoder;
 import org.apache.archiva.redback.policy.encoders.SHA1PasswordEncoder;
 import org.apache.archiva.redback.users.ldap.service.LdapCacheService;
-import org.codehaus.redback.components.apacheds.ApacheDs;
+import org.apache.archiva.redback.components.apacheds.ApacheDs;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
index 491f850a..28f3b8d6 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
@@ -28,7 +28,7 @@
 
   <context:property-placeholder system-properties-mode="OVERRIDE"/>
 
-  <bean name="apacheDS#test" class="org.codehaus.redback.components.apacheds.DefaultApacheDs"
+  <bean name="apacheDS#test" class="org.apache.archiva.redback.components.apacheds.DefaultApacheDs"
       scope="prototype">
     <property name="basedir" value="${basedir}/target/apacheds"/>
     <property name="port" value="${ldapPort}"/>
diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java b/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
index 37407d54..97767c04 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
@@ -28,7 +28,7 @@ import org.apache.archiva.redback.policy.encoders.SHA1PasswordEncoder;
 import org.apache.archiva.redback.users.UserManager;
 import org.apache.archiva.redback.users.UserNotFoundException;
 import org.apache.archiva.redback.users.ldap.service.LdapCacheService;
-import org.codehaus.redback.components.apacheds.ApacheDs;
+import org.apache.archiva.redback.components.apacheds.ApacheDs;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml b/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
index de6aad93..689b6b7a 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
@@ -28,7 +28,7 @@
 
   <context:property-placeholder system-properties-mode="OVERRIDE"/>
 
-  <bean name="apacheDS#test" class="org.codehaus.redback.components.apacheds.DefaultApacheDs"
+  <bean name="apacheDS#test" class="org.apache.archiva.redback.components.apacheds.DefaultApacheDs"
       scope="prototype">
     <property name="basedir" value="${basedir}/target/apacheds"/>
     <property name="port" value="${ldapPort}"/>