diff --git a/tests/build.xml b/tests/build.xml
index 21a6a0f7..684bbdb3 100644
--- a/tests/build.xml
+++ b/tests/build.xml
@@ -26,13 +26,11 @@
 
   <!-- generates additional methods for distributed object classes -->
   <target name="gendobj" depends="prepare"> 
-    <taskdef name="dobj"
-             classname="com.threerings.presents.tools.GenDObjectTask"
+    <taskdef name="dobj" classname="com.threerings.presents.tools.GenDObjectTask"
              classpathref="classpath"/>
     <!-- make sure the dobject class files are all compiled -->
     <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false"
-           debug="on" optimize="${build.optimize}" deprecation="on"
-           source="1.4" target="1.4">
+           debug="on" optimize="${build.optimize}" deprecation="on" source="1.4" target="1.4">
       <classpath refid="classpath"/>
       <include name="**/*Object.java"/>
     </javac>
@@ -42,29 +40,25 @@
     </dobj>
   </target>
 
-  <!-- generates marshaller and dispatcher classes for all invocation
-       service declarations -->
+  <!-- generates marshaller and dispatcher classes for all invocation service declarations -->
   <target name="genservice">
     <apply executable="../bin/genservice" failonerror="true" parallel="true">
       <arg value="--classpath"/>
       <arg value="${classes.dir}:${narya.classes.dir}"/>
       <arg value="--sourcedir"/>
       <arg value="src/java"/>
-      <fileset dir="src/java" includes="**/*Service.java"
-        excludes="**/InvocationService.java"/>
+      <fileset dir="src/java" includes="**/*Service.java"/>
     </apply>
   </target>
 
-  <!-- generates sender and decoder classes for all invocation
-       receiver declarations -->
+  <!-- generates sender and decoder classes for all invocation receiver declarations -->
   <target name="genreceiver">
     <apply executable="../bin/genreceiver" failonerror="true" parallel="true">
       <arg value="--classpath"/>
       <arg value="${classes.dir}:${narya.classes.dir}"/>
       <arg value="--sourcedir"/>
       <arg value="src/java"/>
-      <fileset dir="src/java" includes="**/*Receiver.java"
-        excludes="**/InvocationReceiver.java"/>
+      <fileset dir="src/java" includes="**/*Receiver.java"/>
     </apply>
   </target>
 
@@ -102,34 +96,26 @@
   <!-- test the component metadata bundling process -->
   <target name="cbundles" description="Build component bundles.">
     <!-- define our tasks -->
-    <taskdef name="metabundle"
-      classname="com.threerings.cast.bundle.tools.MetadataBundlerTask"
-      classpathref="classpath"/>
-    <taskdef name="cbundle"
-      classname="com.threerings.cast.bundle.tools.ComponentBundlerTask"
-      classpathref="classpath"/>
+    <taskdef name="metabundle" classpathref="classpath"
+      classname="com.threerings.cast.bundle.tools.MetadataBundlerTask"/>
+    <taskdef name="cbundle" classpathref="classpath"
+      classname="com.threerings.cast.bundle.tools.ComponentBundlerTask"/>
 
     <!-- build the metadata bundles -->
-    <metabundle actiondef="${cbundle.dir}/actions.xml"
-      classdef="${cbundle.dir}/classes.xml"
-      target="${cbundle.dir}/metadata.jar"/>
+    <metabundle actiondef="${cbundle.dir}/actions.xml" classdef="${cbundle.dir}/classes.xml"
+                target="${cbundle.dir}/metadata.jar"/>
 
     <!-- blow away the components map file so that we get a consistent -->
     <!-- mapping every time-->
     <delete file="${cbundle.dir}/components.map"/>         
 
     <!-- build the component bundles -->
-    <cbundle actiondef="${cbundle.dir}/actions.xml"
-      target="${cbundle.dir}/pirate/components.jar"
-      mapfile="${cbundle.dir}/components.map"
-      root="${cbundle.dir}/pirate">
-      <fileset dir="${cbundle.dir}/pirate" includes="**/*.png"
-        excludes="components/**"/>
+    <cbundle actiondef="${cbundle.dir}/actions.xml" target="${cbundle.dir}/pirate/components.jar"
+             mapfile="${cbundle.dir}/components.map" root="${cbundle.dir}/pirate">
+      <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">
+    <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"
         excludes="components/**"/>
     </cbundle>
@@ -142,11 +128,9 @@
     <delete file="${tbundle.dir}/tilesets.map"/>         
 
     <!-- build the tileset bundles -->
-    <taskdef name="tilebundle"
-      classname="com.threerings.media.tile.bundle.tools.TileSetBundlerTask"
-      classpathref="classpath"/>
-    <tilebundle config="${tbundle.dir}/bundler-config.xml"
-      mapfile="${tbundle.dir}/tilesets.map">
+    <taskdef name="tilebundle" classpathref="classpath"
+      classname="com.threerings.media.tile.bundle.tools.TileSetBundlerTask"/>
+    <tilebundle config="${tbundle.dir}/bundler-config.xml" mapfile="${tbundle.dir}/tilesets.map">
       <fileset dir="${tbundle.dir}/ground" includes="**/*.xml"/>
     </tilebundle>
     <tilebundle config="${tbundle.dir}/bundler-config.xml"
@@ -155,9 +139,8 @@
     </tilebundle>
 
     <!-- build the fringe configurations -->
-    <taskdef name="conffringe"
-      classname="com.threerings.miso.tile.tools.CompileFringeConfigurationTask"
-      classpathref="classpath"/>
+    <taskdef name="conffringe" classpathref="classpath"
+      classname="com.threerings.miso.tile.tools.CompileFringeConfigurationTask"/>
     <conffringe
      tilesetmap="${tbundle.dir}/tilesets.map"
      fringedef="rsrc/config/miso/tile/fringeconf.xml"
@@ -165,8 +148,7 @@
   </target>
 
   <!-- run the tests -->
-  <target name="test" depends="compile,cbundles,tsbundles"
-    description="Run the tests.">
+  <target name="test" depends="compile,cbundles,tsbundles" description="Run the tests.">
     <junit printsummary="no" haltonfailure="yes" fork="${junit.fork}">
       <classpath refid="classpath"/>
       <sysproperty key="test_dir" value="${test.dir}"/>