diff --git a/xCAT-test/autotest/testcase/simulator/change_ip.sh b/xCAT-test/autotest/testcase/simulator/change_ip.sh
old mode 100644
new mode 100755
diff --git a/xCAT-test/autotest/testcase/simulator/clear_simulator b/xCAT-test/autotest/testcase/simulator/clear_simulator
index 24a95a41b..85b2557bd 100644
--- a/xCAT-test/autotest/testcase/simulator/clear_simulator
+++ b/xCAT-test/autotest/testcase/simulator/clear_simulator
@@ -1,4 +1,5 @@
 start:clear_openbmc_simulator
-cmd:sh /opt/xcat/share/xcat/tools/autotest/testcase/setup_simulator/change_ip.sh -c $$MN $$CN
+description:clear evironment
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/setup_simulator/change_ip.sh -c $$MN $$CN
 check:rc==0
 end
diff --git a/xCAT-test/autotest/testcase/simulator/install_git.sh b/xCAT-test/autotest/testcase/simulator/install_git.sh
new file mode 100755
index 000000000..d00e2475c
--- /dev/null
+++ b/xCAT-test/autotest/testcase/simulator/install_git.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+os=`cat /etc/*release*`
+
+if [[ "$os" =~ "Red Hat" ]] || [[ "$os" =~ "suse" ]]; then
+    yum install git
+    if [ $? != 0 ]; then
+        echo "Install git Failed." >> $log_file
+        exit 1
+    fi
+elif [[ "$os" =~ "ubuntu" ]]; then
+    apt-get install git
+    if [ $? != 0 ]; then
+        echo "Install git Failed." >> $log_file
+        exit 1
+    fi
+fi
+
+cd 
+
+git clone git@github.com:xuweibj/openbmc_simulator.git
+
+exit $?
+
diff --git a/xCAT-test/autotest/testcase/simulator/setup_simulator b/xCAT-test/autotest/testcase/simulator/setup_simulator
index 34f66896b..29fae143e 100644
--- a/xCAT-test/autotest/testcase/simulator/setup_simulator
+++ b/xCAT-test/autotest/testcase/simulator/setup_simulator
@@ -1,8 +1,9 @@
 start:setup_openbmc_simulator
-cmd:git clone git@github.com:xuweibj/openbmc_simulator.git
+description:install dependent packaages, setup and start openbmc simulator
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/install_git.sh
 check:rc==0
 cmd:/root/openbmc_simulator/simulator &
 check:rc==0
-cmd:sh /opt/xcat/share/xcat/tools/autotest/testcase/setup_simulator/change_ip.sh -s $$MN $$CN
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/change_ip.sh -s $$MN $$CN
 check:rc==0
 end