@@ -731,11 +731,11 @@
 ;; > 0 RUNNING and test_dead then send KILLREQ ==> COMPLETED
 ;; 0 RUNNING ==> this is actually the first condition, should not get here
 
 (define (launch:end-of-run-check run-id )
     (let* ((not-completed-cnt (rmt:get-not-completed-cnt run-id))  
-           (running-cnt (rmt:get-count-tests-running-for-run-id run-id #f)) ;; fastmode=no
+           (running-cnt (rmt:get-count-tests-running-for-run-id run-id))
            (all-test-launched (rmt:get-var (conc "lunch-complete-" run-id)))
            (current-state (rmt:get-run-state run-id))
            (current-status (rmt:get-run-status run-id)))
      ;;get-vars run-id to query metadata table to check if all completed. if all-test-launched = yes then only not-completed-cnt = 0 means everyting is completed if no entry found in the table do nothing 
      (debug:print 0 *default-log-port* "Running test cnt :" running-cnt)                      
@@ -771,11 +771,13 @@
               (if (not (null? tal))
 				  (loop (car tal) (cdr tal)))))))))))        
  
 (define (launch:is-test-alive host pid)
   (if (and host pid (not (equal? host "n/a")))
-      (let* ((cmd (conc "ssh " host " pstree -A " pid))
+      (let* ((is-local (equal? host (get-host-name)))
+	     (ssh-cmd   (if is-local " " (conc "ssh " host " ")))
+	     (cmd (conc ssh-cmd "pstree -A " pid))
 	     (output (with-input-from-pipe cmd read-lines)))
 	(debug:print 2 *default-log-port* "Running " cmd " received " output)
 	(if (eq? (length output) 0)
 	   #f
 	   #t))