@@ -2139,10 +2139,11 @@
 		(run-name  (db:get-value-by-header run header "runname"))
 		(tests     (if (not (equal? run-state "locked"))
 			       (proc-get-tests run-id)
 			       '()))
 		(lasttpath "/does/not/exist/I/hope")
+    (lastrealpath "/does/not/exist/I/hope")
 		(worker-thread #f))
 	   (debug:print-info 4 *default-log-port* "runs:operate-on run=" run ", header=" header)
 	   (if (not (null? tests))
 	       (begin
 		 (case action
@@ -2315,11 +2316,17 @@
                                         ;; NOTE: This is suboptimal as the testdata will be used later and the state/status may have changed ...
                                         (if (null? tal)
                                             (loop new-test-dat tal)
                                             (loop (car tal)(append tal (list new-test-dat)))))
                                       (begin
+                                        (set! lasttpath (db:test-get-rundir new-test-dat)) ;; remember this path for run removal
+                                        (if (file-exists? lasttpath) 
+                                          (set! lastrealpath (resolve-pathname lasttpath))
+                                          (set! lastrealpath lasttpath)
+                                        )
                                         (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
@@ -2392,31 +2399,38 @@
 	   ;; 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
+         ;; Remove the last dir from the path.
+         ;; And same for the link-resolved path
 		     (let* ((dparts  (string-split lasttpath "/"))
-			    (runpath (conc "/" (string-intersperse 
-						(take dparts (- (length dparts) 1))
-						"/"))))
-		       (debug:print 1 *default-log-port* "Removing run: " runkey " " (db:get-value-by-header run header "runname") " and related record")
-                       (if (not keep-records)
-                           (begin
-                             (rmt:delete-run run-id)
-                             (rmt:delete-old-deleted-test-records)))
-                           ;; (rmt:set-var "DELETED_TESTS" (current-seconds))
-		       ;; need to figure out the path to the run dir and remove it if empty
-		       ;;    (if (null? (glob (conc runpath "/*")))
-		       ;;        (begin
-		       ;; 	 (debug:print 1 *default-log-port* "Removing run dir " runpath)
-		       ;; 	 (system (conc "rmdir -p " runpath))))
+			      (linkspath (conc "/" (string-intersperse (take dparts (- (length dparts) 1)) "/")))
+            (real-dparts (string-split lastrealpath "/"))
+			      (realpath (conc "/" (string-intersperse (take real-dparts (- (length real-dparts) 1)) "/")))
+            )
+
+            (debug:print 1 *default-log-port* "Removing run: " linkspath)
+            (if (not keep-records)
+               (begin
+                 (debug:print 1 *default-log-port* "Removing DB records for the run.")
+                 (rmt:delete-run run-id)
+                 (rmt:delete-old-deleted-test-records))
+            )
+	          (debug:print 1 *default-log-port* "Recursively removing links dir " linkspath)
+            (runs:recursive-delete-with-error-msg linkspath)
+
+            (debug:print 1 *default-log-port* "Recursively removing real dir " realpath)
+            (runs:recursive-delete-with-error-msg realpath)
+
 		       )))))
 	 ))
      runs)
     ;; (sqlite3:finalize! (db:delay-if-busy tdbdat))
-    )
-  #t)
+  )
+#t
+)
 
 (define (runs:remove-test-directory test mode) ;; remove-data-only)
   (let* ((run-dir       (db:test-get-rundir test))    ;; run dir is from the link tree
 	 (real-dir      (if (common:file-exists? run-dir)
 			    ;; (resolve-pathname run-dir)
@@ -2444,15 +2458,15 @@
       ((archive-remove)  (mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "ARCHIVE_REMOVING" #f #f)))
     (debug:print-info 1 *default-log-port* "Attempting to remove " (if real-dir (conc " dir " real-dir " and ") "") " link " run-dir)
     (if (and real-dir 
 	     (> (string-length real-dir) 5)
 	     (common:file-exists? real-dir)) ;; bad heuristic but should prevent /tmp /home etc.
-	(begin ;; let* ((realpath (resolve-pathname run-dir)))
-	  (debug:print-info 1 *default-log-port* "Recursively removing " real-dir)
-	  (if (common:file-exists? real-dir)
-	      (runs:safe-delete-test-dir real-dir)
-	      (debug:print 0 *default-log-port* "WARNING: test dir " real-dir " appears to not exist or is not readable")))
+	(let* ((realpath (resolve-pathname run-dir)))
+	  (debug:print-info 1 *default-log-port* "Recursively removing " realpath)
+	  (if (common:file-exists? realpath)
+	      (runs:safe-delete-test-dir realpath)
+	      (debug:print 0 *default-log-port* "WARNING: test dir " realpath " appears to not exist or is not readable")))
 	(if real-dir 
 	    (debug:print 0 *default-log-port* "WARNING: directory " real-dir " does not exist")
 	    (debug:print 0 *default-log-port* "WARNING: no real directory corrosponding to link " run-dir ", nothing done")))
     (if (symbolic-link? run-dir)
 	(begin