Index: build/unittest.sh
===================================================================
diff -u -rb990642a8e8619d04054cb6e0e1cecc4b9eddf22 -rf9633137c25b07f0689df9711b88d00463cc787b
--- build/unittest.sh	(.../unittest.sh)	(revision b990642a8e8619d04054cb6e0e1cecc4b9eddf22)
+++ build/unittest.sh	(.../unittest.sh)	(revision f9633137c25b07f0689df9711b88d00463cc787b)
@@ -128,21 +128,31 @@
         ./setupscript/projectsetup.sh ${buildSpecs[$PROJECT_NAME_INDEX]} ${buildSpecs[$PROJECT_CHECKOUT_INDEX]} \
 									  ${buildSpecs[$COMMON_CHECKOUT_INDEX]}
     else
-        cp -r $LOCAL_PROJECT_DIR/application                    application
-        cp -r $LOCAL_PROJECT_DIR/common                    		  common
+        cp -r $LOCAL_PROJECT_DIR/application              application
+        cp -r $LOCAL_PROJECT_DIR/common                   common
     fi
 
     echo " ------------------------------ Clone the Test Suites"
     if [ -z "$RUN_FOR_LOCAL" ]; then
         git clone ssh://git@dvm-linux02:7999/ui/testsuites.git  testsuites
+	
+	local currentDir=$(pwd)
+	
+	if [[ ! -z ${buildSpecs[$PROJECT_CHECKOUT_INDEX]} ]]
+	then
+		cd testsuites
+		git checkout ${buildSpecs[$PROJECT_CHECKOUT_INDEX]}
+		
+		cd $currentDir
+	fi
 
-        cd testsuites/tools
-        ./setup_env.sh ${buildSpecs[$PROJECT_CHECKOUT_INDEX]}
+     cd testsuites/tools
+     ./setup_env.sh ${buildSpecs[$PROJECT_CHECKOUT_INDEX]}
 
-        # Updated paths.ini
+    # Updated paths.ini
 	# Cannot use sudo in an automated script
 	# The path to workspace_UI has been updated in /opt/squishqt/etc/paths.ini manually
-        #sudo python3 update_paths.py --squishqt $SQUISH_DIR
+    #sudo python3 update_paths.py --squishqt $SQUISH_DIR
 
     else
         cp -r $LOCAL_PROJECT_DIR/testsuites                     testsuites