diff --git a/build.xml b/build.xml
index 73cc4982a..e82dbcb37 100644
--- a/build.xml
+++ b/build.xml
@@ -105,6 +105,7 @@
   <!-- cleans out the installed application -->
   <target name="clean">
     <delete dir="${deploy.dir}"/>
+    <ant dir="tests" target="clean"/>
   </target>
 
   <!-- build the java class files -->
@@ -162,11 +163,17 @@
     </copy>
   </target>
 
+  <!-- builds the various tests -->
+  <target name="tests">
+    <ant dir="tests" target="compile"/>
+  </target>
+
   <!-- a target for rebuilding everything -->
-  <target name="all" depends="clean,prepare,compile,ncompile,javadoc,dist"/>
+  <target name="all"
+          depends="clean,prepare,compile,ncompile,javadoc,tests,dist"/>
 
   <!-- builds our distribution files (war and jar) -->
-  <target name="dist" depends="prepare,compile,ncompile">
+  <target name="dist" depends="prepare,compile,ncompile,tests">
     <!-- build our various jar files -->
     <jar destfile="${deploy.dir}/${app.name}-base.jar">
       <fileset dir="${classes.dir}" includes="com/threerings/io/**"/>
diff --git a/tests/src/java/com/threerings/jme/client/JabberApp.java b/tests/src/java/com/threerings/jme/client/JabberApp.java
index 7c9d8670a..77a6d2f6b 100644
--- a/tests/src/java/com/threerings/jme/client/JabberApp.java
+++ b/tests/src/java/com/threerings/jme/client/JabberApp.java
@@ -45,9 +45,11 @@ import com.threerings.jme.JmeApp;
 public class JabberApp extends JmeApp
 {
     // documentation inherited
-    public void init ()
+    public boolean init ()
     {
-        super.init();
+        if (!super.init()) {
+            return false;
+        }
 
         // initialize our client instance
         _client = new JabberClient();
@@ -81,6 +83,8 @@ public class JabberApp extends JmeApp
 
         // speed up key input
         _input.setKeySpeed(100f);
+
+        return true;
     }
 
     public void run (String server, int port, String username, String password)
diff --git a/tests/src/java/com/threerings/parlor/TestConfig.java b/tests/src/java/com/threerings/parlor/TestConfig.java
index fb4409899..741e01726 100644
--- a/tests/src/java/com/threerings/parlor/TestConfig.java
+++ b/tests/src/java/com/threerings/parlor/TestConfig.java
@@ -21,7 +21,7 @@
 
 package com.threerings.parlor;
 
-import com.threerings.parlor.client.GameConfigurator;
+import com.threerings.parlor.game.client.GameConfigurator;
 import com.threerings.parlor.game.data.GameConfig;
 
 public class TestConfig extends GameConfig