diff --git a/build.xml b/build.xml
index d8a2743f36..5822b7777c 100644
--- a/build.xml
+++ b/build.xml
@@ -2265,6 +2265,7 @@
   <classpathentry kind="src" output="build/test/classes" path="test/distributed"/>
   <classpathentry kind="src" output="build/test/classes" path="test/simulator/asm"/>
   <classpathentry kind="src" output="build/test/classes" path="test/simulator/main"/>
+  <classpathentry kind="src" output="build/test/classes" path="test/simulator/test"/>
   <classpathentry kind="src" output="build/test/classes" path="test/resources" />
   <classpathentry kind="src" path="tools/stress/src"/>
   <classpathentry kind="src" path="tools/fqltool/src"/>
@@ -2272,6 +2273,7 @@
   <classpathentry kind="src" output="build/test/fqltool-classes" path="tools/fqltool/test/unit" />
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="output" path="build/classes/eclipse"/>
+  <classpathentry kind="lib" path="${build.classes.main}"/>
   <classpathentry kind="lib" path="test/conf"/>
   <classpathentry kind="lib" path="${java.home}/../lib/tools.jar"/>
   ${eclipse-libs-list}