diff --git a/build/build-tests.xml b/build/build-tests.xml
index e78d30b404a..4e31fda8b48 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/ -d localhost -m localhost" />
+          <arg line="setup.sh -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 866d8c693bb..623fc7631c5 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:' OPTION
+while getopts 't:d:m:c:' OPTION
 do
   case $OPTION in
   d)    dflag=1
@@ -31,6 +31,9 @@ do
   m)    mflag=1
 		MGMT_SVR="$OPTARG"
 		;;
+  c)    cflag=1
+		CONFIG="$OPTARG"
+		;;
   ?)	usage
 		failed 2
 		;;