@@ -364,11 +364,12 @@
 		     '("-list-servers"
 		       "-stop-server"
 		       "-show-cmdinfo"
 		       "-list-runs")))
 	(if (setup-for-run)
-	    (begin
+	    (let ((run-id    (and (args:get-arg "-run-id")
+				  (string->number (args:get-arg "-run-id")))))
 	      ;; (set! *fdb*   (filedb:open-db (conc *toppath* "/db/paths.db")))
 	      ;; if not list or kill then start a client (if appropriate)
 	      (if (or (args-defined? "-h" "-version" "-gen-megatest-area" "-gen-megatest-test")
 		      (eq? (length (hash-table-keys args:arg-hash)) 0))
 		  (debug:print-info 1 "Server connection not needed")
@@ -389,14 +390,12 @@
 								      "fs"))))
 		    (debug:print 2 "chosen-transport: " chosen-transport " have; config=" transport-from-config ", cmdln=" transport-from-cmdln ", cmdinfo=" transport-from-cmdinfo)
 		    (case chosen-transport
 		      ((http)
 		       (set! *transport-type 'http)
-		       (server:ensure-running)
-		       ;; Get rid of this
-
-		       (client:launch))
+		       (if run-id (server:ensure-running run-id))
+		       (client:launch run-id))
 		      (else ;; (fs)
 		       (debug:print 0 "ERROR: Should NOT be getting here! fs transport is no longer supported")
 		       (set! *transport-type* 'fs)
 		       (set! *megatest-db* (make-dbr:dbstruct path: *toppath* local: #t))))))))))