diff --git a/tests/script/sh/deploy.bat b/tests/script/sh/deploy.bat
index 7a81761e5b..04c7b8a660 100644
--- a/tests/script/sh/deploy.bat
+++ b/tests/script/sh/deploy.bat
@@ -59,7 +59,7 @@ for /f "skip=1" %%A in (
   'wmic computersystem get caption'
 ) do if not defined fqdn set "fqdn=%%A"
 
-echo firstEp                %fqdn%             > %TAOS_CFG%
+echo firstEp                %fqdn%:7100        >  %TAOS_CFG%
 echo fqdn                   %fqdn%             >> %TAOS_CFG%
 echo serverPort             %NODE%             >> %TAOS_CFG%
 echo dataDir                %DATA_DIR%         >> %TAOS_CFG%
diff --git a/tests/script/sh/exec.bat b/tests/script/sh/exec.bat
index 9ad6667644..6651c7aa8f 100644
--- a/tests/script/sh/exec.bat
+++ b/tests/script/sh/exec.bat
@@ -40,9 +40,9 @@ if %EXEC_OPTON% == stop (
   rem wmic process where "name='taosd.exe' and CommandLine like '%%%NODE_NAME%%%'" call terminate > NUL 2>&1
   
   for /f "tokens=1 skip=1" %%A in (
-    'wmic process where "name='taosd.exe'" get processId '
+    'wmic process where "name='taosd.exe' and CommandLine like '%%%NODE_NAME%%%'" get processId '
   ) do (
     rem echo taskkill /IM %%A 
     taskkill /IM %%A > NUL 2>&1
-  )
+  ) 
 )
diff --git a/tests/script/sh/stop_dnodes.bat b/tests/script/sh/stop_dnodes.bat
index e44b7b4e29..ab7af2ca92 100644
--- a/tests/script/sh/stop_dnodes.bat
+++ b/tests/script/sh/stop_dnodes.bat
@@ -2,4 +2,5 @@
 
 rem echo taskkill /F /IM taosd.exe
 
+wmic process where "name='taosd.exe'" call terminate > NUL 2>&1
 taskkill /F /IM taosd.exe > NUL 2>&1
\ No newline at end of file
diff --git a/tests/tsim/src/simSystem.c b/tests/tsim/src/simSystem.c
index bf47c56718..65086eace5 100644
--- a/tests/tsim/src/simSystem.c
+++ b/tests/tsim/src/simSystem.c
@@ -78,8 +78,8 @@ char *simParseHostName(char *varName) {
 }
 
 bool simSystemInit() {
-  taosGetFqdn(simHostName);
   taos_init();
+  taosGetFqdn(simHostName);
   simInitsimCmdList();
   memset(simScriptList, 0, sizeof(SScript *) * MAX_MAIN_SCRIPT_NUM);
   return true;