--- a/common/build.test.xml	Thu Sep 02 14:53:02 2010 +0100
+++ b/common/build.test.xml	Fri Sep 03 10:28:57 2010 +0100
@@ -193,7 +193,7 @@
           <arg value="--publish=${publish.dir}\ats_reports"/>
           <arg value="--bld-drive=${build.drive}"/>
           <arg value="--test-target=${sf.spec.test.target}"/>
-          <arg value="--image-path=${sf.spec.test.imagepath}"/>
+          <arg value="--image-path=${sf.spec.test.image.location}\${sf.spec.test.image.name}"/>
           <arg value="--ats-version=${sf.spec.ats.version}"/>
         </exec>
 
@@ -206,7 +206,7 @@
         <if><equals arg1="${sf.spec.test.target}" arg2="syborg"/>
           <then>
             <delete file="${sf.spec.test.workerroot}/syborg.dtb" quiet="true"/>
-            <copy file="${build.drive}/epoc32/rom/syborg/syborg.dtb" todir="${sf.spec.test.workerroot}" failonerror="false"/>
+            <copy file="${sf.spec.test.image.location}/syborg.dtb" todir="${sf.spec.test.workerroot}" failonerror="false"/>
           </then>
         </if>
         <mkdir dir="${sf.spec.test.workerroot}/${sf.spec.test.package.droppath}"/>