diff --git a/build/build-cloud.xml b/build/build-cloud.xml
index 1e3c64f10e5..04dc45d147c 100755
--- a/build/build-cloud.xml
+++ b/build/build-cloud.xml
@@ -13,6 +13,7 @@
     -->
   <dirname property="base.dir" file="${ant.file.Cloud Stack}/.." />
   <property name="build.dir" location="${base.dir}/build" />
+  <property name="test.classes.dir" location="${test.target.dir}/classes" />
 
   <!-- Import anything that the user wants to set-->
   <!-- Import properties files and environment variables here -->
@@ -62,6 +63,7 @@
   <property name="build.log" location="${target.dir}/ant_verbose.txt" />
 
   <property name="deps.dir" location="${base.dir}/deps" />
+  <property name="tools.jar.dir" location="${base.dir}/tools/tooljars" />
 
   <!-- directories for client compilation-->
   <property name="client.dir" location="${base.dir}/client" />
@@ -145,11 +147,18 @@
   <path id="src.classpath">
   </path>
 
+  <path id="compile.deps.classpath">
+      <fileset dir="${tools.jar.dir}" erroronmissingdir="true">
+          <include name="*.jar" />
+      </fileset>
+  </path>
+
   <path id="deps.classpath">
     <!--filelist files="${deps.classpath}" /-->
     <fileset dir="${deps.dir}" erroronmissingdir="false">
       <include name="*.jar" />
     </fileset>
+    <path refid="compile.deps.classpath" />
   </path>
 
   <path id="dist.classpath">
diff --git a/build/build-tests.xml b/build/build-tests.xml
index 75bfe33931b..400465dde51 100755
--- a/build/build-tests.xml
+++ b/build/build-tests.xml
@@ -26,19 +26,12 @@
   <property name="testclient.dir" location="${base.dir}/test" />
   <property name="testclient.dist.dir" location="${dist.dir}/test" />
   <property name="tools.dist.dir" location="${dist.dir}/cloudapitools" />
-  <property name="tools.jar.dir" location="${base.dir}/tools/tooljars" />
 
   <property name="test.target.dir" location="${target.dir}/test" />
-  <property name="test.classes.dir" location="${test.target.dir}/classes" />
 
   <property name="agent-simulator.jar" value="cloud-agent-simulator.jar" />
   <property name="testclient.jar" value="cloud-test.jar" />
 
-  <path id="compile.deps.classpath">
-      <fileset dir="${tools.jar.dir}" erroronmissingdir="true">
-          <include name="*.jar" />
-      </fileset>
-  </path>
 
   <!-- =================== Agent Simulator ==================== -->
   <path id="agent-simulator.classpath">
@@ -104,7 +97,6 @@
   <path id="testclient.classpath">
     <path refid="deps.classpath" />
     <path refid="dist.classpath" />
-    <path refid="compile.deps.classpath" />
   </path>
   <target name="compile-testclient" depends="-init-test, compile-utils" description="Compile the test client.">
     <echo message="src is ${testclient.dir}"/>