diff --git a/build/build-tests.xml b/build/build-tests.xml
index 4e31fda8b48..50133925d24 100755
--- a/build/build-tests.xml
+++ b/build/build-tests.xml
@@ -109,7 +109,7 @@
 
   <target name="run-simulator-tests">
       <exec dir="test/" executable="bash">
-          <arg line="setup.sh -t integration/smoke-simulator/ -c integration/smoke-simulator/simulator-smoke.cfg -d localhost -m localhost" />
+          <arg line="setup.sh -b ${base.dir}/test -t integration/smoke-simulator/ -c integration/smoke-simulator/simulator-smoke.cfg -d localhost -m localhost" />
       </exec>
   </target>
   <!--   -->
diff --git a/test/setup.sh b/test/setup.sh
index 623fc7631c5..4919a374da8 100755
--- a/test/setup.sh
+++ b/test/setup.sh
@@ -19,7 +19,7 @@ TESTDIR="/root/cloudstack-oss/test/integration/smoke-simulator/"
 CONFIG="/root/cloudstack-oss/test/integration/smoke-simulator/simulator-smoke.cfg"
 DB_SVR="localhost"
 
-while getopts 't:d:m:c:' OPTION
+while getopts 't:d:m:c:b:' OPTION
 do
   case $OPTION in
   d)    dflag=1
@@ -34,6 +34,9 @@ do
   c)    cflag=1
 		CONFIG="$OPTARG"
 		;;
+  b)    bflag=1
+		BASEDIR="$OPTARG"
+		;;
   ?)	usage
 		failed 2
 		;;
@@ -64,7 +67,7 @@ then
     sleep 60
     python -m marvin.deployAndRun -c $CONFIG -t /tmp/t.log -r /tmp/r.log -f $TESTDIR/testSetupSuccess.py -l
     cat /tmp/r.log
-    python -m marvin.deployAndRun -c $CONFIG -t /tmp/t.log -r /tmp/r.log -d $TESTDIR -l
+    python -m marvin.deployAndRun -c $CONFIG -t /tmp/t.log -r /tmp/r.log -d $TESTDIR -l -n
     echo "Done"
 else
     echo "Python version 2.7 not detected on system. Aborting"