diff --git a/tests/build.xml b/tests/build.xml
index 67e1f2d43..a90463b56 100644
--- a/tests/build.xml
+++ b/tests/build.xml
@@ -81,22 +81,19 @@
     <taskdef name="cbundle"
       classname="com.threerings.cast.bundle.tools.ComponentBundlerTask"/>
 
-    <!-- build the pirate metadata and component bundles -->
-    <metabundle actiondef="${cbundle.dir}/pirate/actions.xml"
-      classdef="${cbundle.dir}/pirate/classes.xml"
-      target="${cbundle.dir}/pirate/metadata.jar"/>
+    <!-- build the metadata bundles -->
+    <metabundle actiondef="${cbundle.dir}/actions.xml"
+      classdef="${cbundle.dir}/classes.xml"
+      target="${cbundle.dir}/metadata.jar"/>
+
+    <!-- build the component bundles -->
     <cbundle target="${cbundle.dir}/pirate/components.jar"
-      mapfile="${cbundle.dir}/pirate/components.map">
+      mapfile="${cbundle.dir}/components.map">
       <fileset dir="${cbundle.dir}/pirate" includes="**/*.png"/>
     </cbundle>
-
-    <!-- build the ship metadata and component bundles -->
-    <metabundle actiondef="${cbundle.dir}/ship/actions.xml"
-      classdef="${cbundle.dir}/ship/classes.xml"
-      target="${cbundle.dir}/ship/metadata.jar"/>
-    <cbundle target="${cbundle.dir}/ship/components.jar"
-      mapfile="${cbundle.dir}/ship/components.map">
-      <fileset dir="${cbundle.dir}/ship" includes="**/*.png"/>
+    <cbundle target="${cbundle.dir}/vessel/components.jar"
+      mapfile="${cbundle.dir}/components.map">
+      <fileset dir="${cbundle.dir}/vessel" includes="**/*.png"/>
     </cbundle>
   </target>
 
diff --git a/tests/rsrc/bundles/components/actions.xml b/tests/rsrc/bundles/components/actions.xml
index 85cb6504e..6bc5adbc4 100644
--- a/tests/rsrc/bundles/components/actions.xml
+++ b/tests/rsrc/bundles/components/actions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
-<!-- $Id: actions.xml,v 1.3 2002/02/14 01:11:11 mdb Exp $ -->
+<!-- $Id: actions.xml,v 1.4 2002/02/19 22:10:30 mdb Exp $ -->
 
 <!-- test component action definitions -->
 <actions>
@@ -26,4 +26,16 @@
       <gapSize>0, 0</gapSize>
     </tileset>
   </action>
+
+  <action name="sailing">
+    <framesPerSecond>8</framesPerSecond>
+    <origin>22,46</origin>
+    <tileset>
+      <widths>44, 44, 44, 44, 44, 44, 44, 44</widths>
+      <heights>46, 46, 46, 46, 46, 46, 46, 46</heights>
+      <tileCounts>1, 1, 1, 1, 1, 1, 1, 1</tileCounts>
+      <offsetPos>0, 0</offsetPos>
+      <gapSize>0, 0</gapSize>
+    </tileset>
+  </action>
 </actions>
diff --git a/tests/rsrc/bundles/components/classes.xml b/tests/rsrc/bundles/components/classes.xml
index f9113fc46..a79e72b7f 100644
--- a/tests/rsrc/bundles/components/classes.xml
+++ b/tests/rsrc/bundles/components/classes.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" standalone="yes"?>
-<!-- $Id: classes.xml,v 1.3 2002/02/14 01:11:11 mdb Exp $ -->
+<!-- $Id: classes.xml,v 1.4 2002/02/19 22:10:30 mdb Exp $ -->
 
 <!-- test component class definitions -->
 <classes>
+  <!-- character component classes -->
   <class name="legs" renderPriority="1"/>
   <class name="feet" renderPriority="0"/>
   <class name="hands" renderPriority="2"/>
@@ -10,4 +11,7 @@
   <class name="head" renderPriority="4"/>
   <class name="hair" renderPriority="5"/>
   <class name="hat" renderPriority="6"/>
+
+  <!-- vessel classes -->
+  <class name="navsail" renderPriority="0"/>
 </classes>
diff --git a/tests/rsrc/bundles/components/vessel/actions.xml b/tests/rsrc/bundles/components/vessel/actions.xml
deleted file mode 100644
index 14738a805..000000000
--- a/tests/rsrc/bundles/components/vessel/actions.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<!-- $Id: actions.xml,v 1.1 2002/02/19 20:01:21 mdb Exp $ -->
-
-<!-- test ship action definitions -->
-<actions>
-  <action name="standing">
-    <framesPerSecond>8</framesPerSecond>
-    <origin>22,46</origin>
-    <tileset>
-      <widths>44, 44, 44, 44, 44, 44, 44, 44</widths>
-      <heights>46, 46, 46, 46, 46, 46, 46, 46</heights>
-      <tileCounts>1, 1, 1, 1, 1, 1, 1, 1</tileCounts>
-      <offsetPos>0, 0</offsetPos>
-      <gapSize>0, 0</gapSize>
-    </tileset>
-  </action>
-</actions>
diff --git a/tests/rsrc/bundles/components/vessel/classes.xml b/tests/rsrc/bundles/components/vessel/classes.xml
deleted file mode 100644
index 81cc12c9d..000000000
--- a/tests/rsrc/bundles/components/vessel/classes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<!-- $Id: classes.xml,v 1.2 2002/02/19 20:17:36 mdb Exp $ -->
-
-<!-- test vessel class definitions -->
-<classes>
-  <class name="navsail" renderPriority="0"/>
-</classes>
diff --git a/tests/rsrc/config/resource/manager.properties b/tests/rsrc/config/resource/manager.properties
index d58de640c..993e9e0d6 100644
--- a/tests/rsrc/config/resource/manager.properties
+++ b/tests/rsrc/config/resource/manager.properties
@@ -1,5 +1,5 @@
 #
-# $Id: manager.properties,v 1.8 2002/02/19 20:00:32 mdb Exp $
+# $Id: manager.properties,v 1.9 2002/02/19 22:10:30 mdb Exp $
 #
 # Test resource manager configuration
 
@@ -7,10 +7,7 @@
 resource.set.tilesets = bundles/tiles/ground/bundle.jar:\
 	bundles/tiles/objects/bundle.jar
 
-# configure the character BundledComponentRepository
-resource.set.components = bundles/components/pirate/metadata.jar:\
-	bundles/components/pirate/components.jar
-
-# configure the ship BundledComponentRepository
-resource.set.ships = bundles/components/ship/metadata.jar:\
-	bundles/components/ship/components.jar
+# configure the BundledComponentRepository
+resource.set.components = bundles/components/metadata.jar:\
+	bundles/components/pirate/components.jar: \
+	bundles/components/vessel/components.jar