@@ -2044,11 +2044,11 @@
 	 (state-status (if (string? new-state-status) (string-split new-state-status ",") '(#f #f)))
 	 (rp-mutex     (make-mutex))
 	 (bup-mutex    (make-mutex))
          (keep-records (args:get-arg "-keep-records"))) ;; used in conjunction with -remove-runs to keep the records, TODO: consolidate this with "mode".
 
-    (let* ((write-access-actions '(remove-runs set-state-status archive run-wait))
+    (let* ((write-access-actions '(remove-runs set-state-status archive run-wait kill-runs))
            (dbfile             (conc  *toppath* "/megatest.db"))
            (readonly-mode      (not (file-write-access? dbfile))))
       (when (and readonly-mode
                  (member action write-access-actions))
         (debug:print-error 0 *default-log-port* "megatest.db is readonly.  Cannot proceed with action ["action"] in which write-access isrequired .")
@@ -2081,16 +2081,19 @@
 		(worker-thread #f))
 	   (debug:print-info 4 *default-log-port* "runs:operate-on run=" run ", header=" header)
 	   (if (not (null? tests))
 	       (begin
 		 (case action
+                   ((kill-runs)
+                    (tasks:kill-runner target run-name "%")
+                    (debug:print 1 *default-log-port* "Killing tests for run: " runkey " " (db:get-value-by-header run header "runname"))
+                    )
 		   ((remove-runs)
 		    ;; (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
 		    ;; seek and kill in flight -runtests with % as testpatt here
 		    ;; (if (equal? testpatt "%")
 		    (tasks:kill-runner target run-name testpatt)
-		    
 		    ;; (debug:print 0 *default-log-port* "not attempting to kill any run launcher processes as testpatt is " testpatt))
 		    (debug:print 1 *default-log-port* "Removing tests for run: " runkey " " (db:get-value-by-header run header "runname")))
 		   ((set-state-status)
 		    ;; (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
 		    (debug:print 1 *default-log-port* "Modifying state and staus for tests for run: " runkey " " (db:get-value-by-header run header "runname")))
@@ -2194,11 +2197,11 @@
                                        (if (< (- now last-visit) 1.0)
                                            (thread-sleep! 1.0))
                                        (hash-table-set! backgrounded-remove-last-visit test-fulln (current-seconds))
                                        ;; send to back of line, loop
                                        (let ((newtal (append tal (list test))))
-                                        (loop (car newtal)(cdr newtal)))
+                                         (loop (car newtal)(cdr newtal)))
                                        )
                                       ((done)
                                        ;; drop this one; if remaining, loop, else finish
                                        (hash-table-set! backgrounded-remove-last-visit test-fulln (current-seconds))
                                        (let ((subrun-remove-succeeded (hash-table-ref/default backgrounded-remove-result test-fulln 'exception)))
@@ -2251,10 +2254,32 @@
                                       (begin
                                         (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)))
+                               ((kill-runs)
+                                ;; RUNNING -> KILLREQ
+                                ;; LAUNCHED,RUNNING,REMOTEHOSTSTART -> NOT STARTED
+                                (cond
+                                 ((and has-subrun (member test-state (list "RUNNING" "LAUNCHED" "REMOTEHOSTSTART" "KILLREQ")))
+                                  (common:send-thunk-to-background-thread
+                                   (lambda ()
+                                     (let* ((subrun-remove-succeeded
+                                             (subrun:kill-subrun run-dir keep-records)))
+                                       #t)))
+                                  (if (not (null? tal))
+				    (loop (car tal)(cdr tal)))
+                                  )
+                                 ((member test-state (list "RUNNING" "LAUNCHED" "REMOTEHOSTSTART" "KILLREQ"))
+                                  (debug:print 1 *default-log-port* "INFO: issuing killreq to test "test-fulln)
+                                  (mt:test-set-state-status-by-id run-id (db:test-get-id test) "KILLREQ" "n/a" #f)
+                                  (if (not (null? tal))
+				      (loop (car tal)(cdr tal))))
+                                 (else
+                                  (if (not (null? tal))
+				      (loop (car tal)(cdr tal)))
+                                  )))
 			       ((set-state-status)
                                 (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))