@@ -1199,23 +1199,10 @@
 	    (debug:print 0 "Failed to setup, exiting") 
 	    (exit 1)))
       (open-run-close db:find-and-mark-incomplete #f)
       (set! *didsomething* #t)))
 
-;;======================================================================
-;; Wait on a run to complete
-;;======================================================================
-
-(if (args:get-arg "-run-wait")
-    (begin
-      (if (not (setup-for-run))
-	  (begin
-	    (debug:print 0 "Failed to setup, exiting") 
-	    (exit 1)))
-      (operate-on 'run-wait)
-      (set! *didsomething* #t)))
-
 ;;======================================================================
 ;; Update the tests meta data from the testconfig files
 ;;======================================================================
 
 (if (args:get-arg "-update-meta")
@@ -1250,10 +1237,23 @@
 	    (if (args:get-arg "-repl")
 		(repl)
 		(load (args:get-arg "-load"))))
 	  (exit))
       (set! *didsomething* #t)))
+
+;;======================================================================
+;; Wait on a run to complete
+;;======================================================================
+
+(if (args:get-arg "-run-wait")
+    (begin
+      (if (not (setup-for-run))
+	  (begin
+	    (debug:print 0 "Failed to setup, exiting") 
+	    (exit 1)))
+      (operate-on 'run-wait)
+      (set! *didsomething* #t)))
 
 ;;======================================================================
 ;; Exit and clean up
 ;;======================================================================