diff --git a/tests/build.xml b/tests/build.xml
index 76aa2a9ae..3a8f47c4f 100644
--- a/tests/build.xml
+++ b/tests/build.xml
@@ -92,11 +92,13 @@
 
     <!-- build the component bundles -->
     <cbundle target="${cbundle.dir}/pirate/components.jar"
-      mapfile="${cbundle.dir}/components.map">
+      mapfile="${cbundle.dir}/components.map"
+      root="${cbundle.dir}/pirate">
       <fileset dir="${cbundle.dir}/pirate" includes="**/*.png"/>
     </cbundle>
     <cbundle target="${cbundle.dir}/vessel/components.jar"
-      mapfile="${cbundle.dir}/components.map">
+      mapfile="${cbundle.dir}/components.map"
+      root="${cbundle.dir}/vessel">
       <fileset dir="${cbundle.dir}/vessel" includes="**/*.png"/>
     </cbundle>
   </target>
diff --git a/tests/rsrc/bundles/components/classes.xml b/tests/rsrc/bundles/components/classes.xml
index 978a76438..3012cddc4 100644
--- a/tests/rsrc/bundles/components/classes.xml
+++ b/tests/rsrc/bundles/components/classes.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" standalone="yes"?>
-<!-- $Id: classes.xml,v 1.5 2002/03/05 07:09:59 mdb Exp $ -->
+<!-- $Id: classes.xml,v 1.6 2002/03/08 22:37:21 mdb Exp $ -->
 
 <!-- test component class definitions -->
 <classes>
   <!-- character component classes -->
-  <class name="feet" renderPriority="0"/>
-  <class name="legs" renderPriority="1"/>
-  <class name="hand_left" renderPriority="2"/>
-  <class name="hand_right" renderPriority="2"/>
-  <class name="torso" renderPriority="3"/>
-  <class name="head" renderPriority="4"/>
-  <class name="eyepatch" renderPriority="5"/>
-  <class name="hair" renderPriority="6"/>
-  <class name="hat" renderPriority="7"/>
-  <class name="familiars" renderPriority="8"/>
+  <class name="male/feet" renderPriority="0"/>
+  <class name="male/legs" renderPriority="1"/>
+  <class name="male/hand_left" renderPriority="2"/>
+  <class name="male/hand_right" renderPriority="2"/>
+  <class name="male/torso" renderPriority="3"/>
+  <class name="male/head" renderPriority="4"/>
+  <class name="male/eyepatch" renderPriority="5"/>
+  <class name="male/hair" renderPriority="6"/>
+  <class name="male/hat" renderPriority="7"/>
+  <class name="male/familiars" renderPriority="8"/>
 
   <!-- vessel classes -->
   <class name="navsail" renderPriority="0"/>