diff --git a/redback-users/redback-users-providers/redback-users-cached/src/test/java/org/codehaus/plexus/redback/users/cached/CachedUserManagerTest.java b/redback-users/redback-users-providers/redback-users-cached/src/test/java/org/apache/archiva/redback/users/cached/CachedUserManagerTest.java
similarity index 97%
rename from redback-users/redback-users-providers/redback-users-cached/src/test/java/org/codehaus/plexus/redback/users/cached/CachedUserManagerTest.java
rename to redback-users/redback-users-providers/redback-users-cached/src/test/java/org/apache/archiva/redback/users/cached/CachedUserManagerTest.java
index 2d77749b..e18ed634 100644
--- a/redback-users/redback-users-providers/redback-users-cached/src/test/java/org/codehaus/plexus/redback/users/cached/CachedUserManagerTest.java
+++ b/redback-users/redback-users-providers/redback-users-cached/src/test/java/org/apache/archiva/redback/users/cached/CachedUserManagerTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.users.cached;
+package org.apache.archiva.redback.users.cached;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/redback-users/redback-users-providers/redback-users-cached/src/test/resources/org/codehaus/plexus/redback/config-defaults.properties b/redback-users/redback-users-providers/redback-users-cached/src/test/resources/org/apache/archiva/redback/config-defaults.properties
similarity index 100%
rename from redback-users/redback-users-providers/redback-users-cached/src/test/resources/org/codehaus/plexus/redback/config-defaults.properties
rename to redback-users/redback-users-providers/redback-users-cached/src/test/resources/org/apache/archiva/redback/config-defaults.properties