@@ -2064,11 +2064,12 @@
 			   (let* ((item-path     (db:test-get-item-path new-test-dat))
 				  (test-name     (db:test-get-testname new-test-dat))
 				  (run-dir       ;;(filedb:get-path *fdb*
 				   ;; (rmt:sdb-qry 'getid 
 				   (db:test-get-rundir new-test-dat)) ;; )    ;; run dir is from the link tree
-                                  (has-subrun   (subrun:subrun-test-initialized? run-dir))
+                                  (has-subrun    (and (subrun:subrun-test-initialized? run-dir)
+                                                      (not (subrun:subrun-removed? run-dir))))
 				  (test-state    (db:test-get-state new-test-dat))
 				  (test-fulln    (db:test-get-fullname new-test-dat))
 				  (uname         (db:test-get-uname    new-test-dat))
 				  (toplevel-with-children (and (db:test-get-is-toplevel test)
 							       (> (rmt:test-toplevel-num-items run-id test-name) 0))))
@@ -2084,14 +2085,25 @@
                                           (loop (car tal)(cdr tal))) ;; no else clause - drop it if no more in queue and > 3 tries
                                       (let ((newtal (append tal (list test))))
                                         (loop (car newtal)(cdr newtal))))) ;; loop with test still in queue
                                  (has-subrun
                                   ;; BB TODO - manage toplevasel-retries hash and retries in general
-                                  (subrun:remove-subrun test-run-dir new-test-dat test-name item-path test-state test-fulln toplevel-with-children test)
-                                  
+                                  (debug:print 0 *default-log-port* "WARNING: postponing removal of " test-fulln " with run-id " run-id " as it has a subrun")
+                                  (let* ((subrun-remove-succeeded
+                                          (subrun:remove-subrun run-dir new-test-dat test-name item-path test-state test-fulln toplevel-with-children test)))
+                                    (cond
+                                     (subrun-remove-succeeded
+                                      
+                                      (debug:print 0 *default-log-port* "Now removing of " test-fulln " with run-id " run-id " as it has a subrun")
+                                      (runs:remove-test-directory new-test-dat mode))
+                                     (else
+                                      (let* ((logfile (subrun:get-log-path run-dir "remove")))
+                                        (debug:print 0 *default-log-port* "WARNING: removal of subrun failed.  Please check "logfile" for details."))))
+                                    
+                                  (if (not (null? tal))
+                                            (loop (car tal)(cdr tal)))))
 
-                                  )
                                  (else
                                   (debug:print-info 0 *default-log-port* "test: " test-name " itest-state: " test-state)
                                   (if (member test-state (list "RUNNING" "LAUNCHED" "REMOTEHOSTSTART" "KILLREQ"))
                                       (begin
                                         (if (not (hash-table-ref/default test-retry-time test-fulln #f))