@@ -2172,13 +2172,25 @@
                                         (runs:remove-test-directory new-test-dat mode) ;; 'remove-all)
                                         (if (not (null? tal))
                                             (loop (car tal)(cdr tal)))))))
 				(rmt:update-run-stats run-id (rmt:get-raw-run-stats run-id)))
 			       ((set-state-status)
-                                ;; BB TODO - manage has-subrun case
-				(debug:print-info 2 *default-log-port* "new state " (car state-status) ", new status " (cadr state-status))
-				(mt:test-set-state-status-by-id run-id (db:test-get-id test) (car state-status)(cadr state-status) #f)
+                                (let* ((new-state (car state-status))
+                                       (new-status (cadr state-status))
+                                       (test-id (db:test-get-id test))
+                                       (test-run-dir (db:test-get-rundir new-test-dat))
+                                       (has-subrun (and (subrun:subrun-test-initialized? test-run-dir)
+                                                      (not (subrun:subrun-removed? test-run-dir)))))
+                                  (when has-subrun
+                                     (common:send-thunk-to-background-thread
+                                        (lambda ()
+                                          (subrun:set-state-status test-run-dir state status new-state-status)
+                                          )
+                                        )
+                                    )
+                                  (debug:print-info 2 *default-log-port* "new state " new-state ", new status " new-status )
+                                  (mt:test-set-state-status-by-id run-id test-id new-state new-status #f))
 				(if (not (null? tal))
 				    (loop (car tal)(cdr tal))))
 			       ((run-wait)
                                 ;; BB TODO - manage has-subrun case
 				(debug:print-info 2 *default-log-port* "still waiting, " (length tests) " tests still running")
@@ -2197,11 +2209,12 @@
 					     (debug:print-info 0 *default-log-port* "Estimating disk space usage for " test-fulln ": " (common:get-disk-space-used ddir)))))))
 				(if (not (null? tal))
 				    (loop (car tal)(cdr tal))))
 			       )))
 		       )
-		     (if worker-thread (thread-join! worker-thread))))))
+		     (if worker-thread (thread-join! worker-thread)))
+                   (common:join-backgrounded-threads))))
 	   ;; remove the run if zero tests remain
 	   (if (eq? action 'remove-runs)
 	       (let* ((run-id   (db:get-value-by-header run header "id")) ;; NB// masks run-id from above?
                       (remtests (mt:get-tests-for-run run-id #f '("DELETED") '("n/a") not-in: #t)))
 		 (if (null? remtests) ;; no more tests remaining