Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -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)))

Index: tests/fdktestqa/fdk.config
==================================================================
--- tests/fdktestqa/fdk.config
+++ tests/fdktestqa/fdk.config
@@ -1,13 +1,16 @@
 [fields]
 SYSTEM TEXT
 RELEASE TEXT
 
+[env-override]
 [setup]
 # Adjust max_concurrent_jobs to limit how much you load your machines
 # max_concurrent_jobs 150
-max_concurrent_jobs 500
+max_concurrent_jobs 150
 
 # This is your link path, you can move it but it is generally better to keep it stable
 linktree #{shell readlink -f #{getenv PWD}/../simplelinks}
 
 [include testqa/configs/megatest.abc.config]
+
+timeout 0.025

Index: tests/fdktestqa/testqa/configs/megatest.abc.config
==================================================================
--- tests/fdktestqa/testqa/configs/megatest.abc.config
+++ tests/fdktestqa/testqa/configs/megatest.abc.config
@@ -3,8 +3,7 @@
 state start end completed
 
 # Job tools are more advanced ways to control how your jobs are launched
 [jobtools]
 useshell yes
-launcher nbfake
 
 [include megatest.def.config]