Index: build/unittest.sh
===================================================================
diff -u -rf7391c8924cd2a0f6b0351b02b19ec3fd9a8b93c -r1cfffe4e986c97179e0495e0478ef9ac4f5450b9
--- build/unittest.sh	(.../unittest.sh)	(revision f7391c8924cd2a0f6b0351b02b19ec3fd9a8b93c)
+++ build/unittest.sh	(.../unittest.sh)	(revision 1cfffe4e986c97179e0495e0478ef9ac4f5450b9)
@@ -20,14 +20,14 @@
 	if [[ ! -d "supportscript" ]]
 	then
 		git clone ssh://git@dvm-linux02:7999/bl/supportscript.git
-	fi	
+	fi
 	source ./supportscript/supportscript.sh
 }
 
 function setup_Script_Environment() {
 
     getSupportFunctions
-    
+
     # --- keep Test Folder  folder
     PWD=$(pwd)
     WORKING_DIR=$PWD
@@ -118,15 +118,16 @@
     echo " ------------------------------ Clone the Test Suites"
     if [ -z "$RUN_FOR_LOCAL" ]; then
         git clone ssh://git@dvm-linux02:7999/ui/testsuites.git  testsuites
+
+        cd testsuites/tools
+        ./setup_env.sh
+
+        # Updated paths.ini
+        sudo python3 update_paths.py --squishqt $SQUISH_DIR
+
     else
         cp -r $LOCAL_PROJECT_DIR/testsuites                     testsuites
     fi
-
-    cd testsuites/tools
-    ./setup_env.sh
-
-    # Updated paths.ini
-    sudo python3 update_paths.py --squishqt $SQUISH_DIR
 }
 
 function build_WithCoverage() {