@@ -328,10 +328,22 @@
 			 steps)))))
 		tests))))
        runs)
       (set! *didsomething* #t)
       ))
+
+;;======================================================================
+;; 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"))))
+    (let* ((toppath (setup-for-run))
+	   (db      (if toppath (open-db) #f)))
+      (if db 
+	  (server:start db (args:get-arg "-server"))
+	  (debug:print 0 "ERROR: Failed to setup for megatest"))))
 
 ;;======================================================================
 ;; full run
 ;;======================================================================
 
@@ -391,20 +403,10 @@
 		     (args:get-arg "-runtests")
 		     (args:get-arg "-itempatt")
 		     user
 		     (make-hash-table)))))
 
-;;======================================================================
-;; Start the server
-;;======================================================================
-(if (args:get-arg "-server")
-    (let* ((toppath (setup-for-run))
-	   (db      (if toppath (open-db) #f)))
-      (if db 
-	  (server:start db (args:get-arg "-server"))
-	  (debug:print 0 "ERROR: Failed to setup for megatest"))))
-
 ;;======================================================================
 ;; Rollup into a run
 ;;======================================================================
 (if (args:get-arg "-rollup")
     (general-run-call