@@ -1244,11 +1244,12 @@
 
 ;;======================================================================
 ;; Wait on a run to complete
 ;;======================================================================
 
-(if (args:get-arg "-run-wait")
+(if (and (args:get-arg "-run-wait")
+	 (not (args:get-arg "-runtests"))) ;; run-wait is built into runtests now
     (begin
       (if (not (launch:setup-for-run))
 	  (begin
 	    (debug:print 0 "Failed to setup, exiting") 
 	    (exit 1)))