diff --git a/tests/build.xml b/tests/build.xml
index 34b6abeb1..c63edfe89 100644
--- a/tests/build.xml
+++ b/tests/build.xml
@@ -114,13 +114,15 @@
       target="${cbundle.dir}/pirate/components.jar"
       mapfile="${cbundle.dir}/components.map"
       root="${cbundle.dir}/pirate">
-      <fileset dir="${cbundle.dir}/pirate" includes="**/*.png"/>
+      <fileset dir="${cbundle.dir}/pirate" includes="**/*.png"
+        excludes="components/**"/>
     </cbundle>
     <cbundle actiondef="${cbundle.dir}/actions.xml"
       target="${cbundle.dir}/vessel/components.jar"
       mapfile="${cbundle.dir}/components.map"
       root="${cbundle.dir}/vessel">
-      <fileset dir="${cbundle.dir}/vessel" includes="**/*.png"/>
+      <fileset dir="${cbundle.dir}/vessel" includes="**/*.png"
+        excludes="components/**"/>
     </cbundle>
   </target>
 
diff --git a/tests/rsrc/i18n/messages.properties b/tests/rsrc/i18n/messages.properties
index f74c65868..58e975542 100644
--- a/tests/rsrc/i18n/messages.properties
+++ b/tests/rsrc/i18n/messages.properties
@@ -1,8 +1,8 @@
 #
-# $Id: messages.properties,v 1.1 2002/02/28 23:12:27 mdb Exp $
+# $Id$
 #
 # Test localization properties file
 
-m.foo = Foo arg one is ''{0}'' and two is ''{1}''.
-m.biff = Biff arg one is ''{0}'' and two is ''{1}''.
-m.meta = Meta arg one is ''{0}'' and two is ''{1}''.
+m.foo = Foo arg one is '{0}' and two is '{1}'.
+m.biff = Biff arg one is '{0}' and two is '{1}'.
+m.meta = Meta arg one is '{0}' and two is '{1}'.