@@ -340,21 +340,19 @@
 	  )))
 
 ;;======================================================================
 ;; Start the server - can be done in conjunction with -runall or -runtests (one day...)
 ;;======================================================================
-(if (and (args:get-arg "-server")
-	 (not (or (args:get-arg "-runall")
-		  (args:get-arg "-runtests"))))
+(if (args:get-arg "-server")
     (let* ((toppath (setup-for-run))
 	   (db      (if toppath (open-db) #f)))
       (debug:print 0 "INFO: Starting the standalone server")
       (if db 
 	  (let* ((host:port (db:get-var db "SERVER")) ;; this doen't support multiple servers BUG!!!!
 		 (th2 (server:start db (args:get-arg "-server")))
 		 (th3 (make-thread (lambda ()
-				      (server:keep-running db)))))
+				     (server:keep-running db host:port)))))
 	    (thread-start! th3)
 	    (thread-join! th3))
 	  (debug:print 0 "ERROR: Failed to setup for megatest"))))
 
 ;;======================================================================