Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -282,12 +282,12 @@
   ;; (signal-mask! signum)
   (debug:print 0 "ERROR: Received signal " signum " exiting promptly")
   ;; (std-exit-procedure) ;; shouldn't need this since we are exiting and it will be called anyway
   (exit))
 
-(set-signal-handler! signal/int std-signal-handler)  ;; ^C
-;; (set-signal-handler! signal/term std-signal-handler)
+(set-signal-handler! signal/int  std-signal-handler)  ;; ^C
+(set-signal-handler! signal/term std-signal-handler)
 
 ;;======================================================================
 ;; Misc utils
 ;;======================================================================
 

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -222,27 +222,28 @@
 	 (task-key           (conc (hash-table->alist flags) " " (get-host-name) " " (current-process-id)))
 	 (tdbdat             (tasks:open-db)))
 
     (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
 
-    (set-signal-handler! signal/int
-			 (lambda (signum)
-			   ;; (signal-mask! signum) ;; to mask or not? seems to cause issues in exiting
-			   (set! *time-to-exit* #t)
-			   (print "Received signal " signum ", cleaning up before exit. Please wait...")
-			   (let ((th1 (make-thread (lambda ()
-						     (let ((tdbdat (tasks:open-db)))
-						       (rmt:tasks-set-state-given-param-key task-key "killed"))
-						     (print "Killed by signal " signum ". Exiting")
-						     (exit))))
-				 (th2 (make-thread (lambda ()
-						     (thread-sleep! 3)
-						     (debug:print 0 "Done")
-						     (exit 4)))))
-			     (thread-start! th2)
-			     (thread-start! th1)
-			     (thread-join! th2))))
+    (let ((sighand (lambda (signum)
+		     ;; (signal-mask! signum) ;; to mask or not? seems to cause issues in exiting
+		     (set! *time-to-exit* #t)
+		     (print "Received signal " signum ", cleaning up before exit. Please wait...")
+		     (let ((th1 (make-thread (lambda ()
+					       (let ((tdbdat (tasks:open-db)))
+						 (rmt:tasks-set-state-given-param-key task-key "killed"))
+					       (print "Killed by signal " signum ". Exiting")
+					       (exit))))
+			   (th2 (make-thread (lambda ()
+					       (thread-sleep! 3)
+					       (debug:print 0 "Done")
+					       (exit 4)))))
+		       (thread-start! th2)
+		       (thread-start! th1)
+		       (thread-join! th2)))))
+      (set-signal-handler! signal/int sighand)
+      (set-signal-handler! signal/term sighand))
 
     ;; register this run in monitor.db
     (rmt:tasks-add "run-tests" user target runname test-patts task-key) ;; params)
     (rmt:tasks-set-state-given-param-key task-key "running")
     (runs:set-megatest-env-vars run-id inkeys: keys inrunname: runname) ;; these may be needed by the launching process