@@ -550,12 +550,14 @@
 	 (deferred    '()) ;; delay running these since they have a waiton clause
 	 (runconfigf   (conc  *toppath* "/runconfigs.config")))
     ;; on the first pass or call to run-tests set FAILS to NOT_STARTED if
     ;; -keepgoing is specified
 
+    (set-megatest-env-vars db run-id) ;; these may be needed by the launching process
+    
     (if (file-exists? runconfigf)
-	(setup-env-defaults db runconfigf run-id *already-seen-runconfig-info*)
+	(setup-env-defaults db runconfigf run-id *already-seen-runconfig-info* environ-patt: ".*")
 	(debug:print 0 "WARNING: You do not have a run config file: " runconfigf))
 
     (if (and (eq? *passnum* 0)
 	     (args:get-arg "-keepgoing"))
 	(begin
@@ -590,11 +592,13 @@
 (define (run-one-test db run-id test-name keyvallst)
   (debug:print 1 "Launching test " test-name)
   ;; All these vars might be referenced by the testconfig file reader
   (setenv "MT_TEST_NAME" test-name) ;; 
   (setenv "MT_RUNNAME"   (args:get-arg ":runname"))
-  (set-megatest-env-vars db run-id) ;; these may be needed by the launching process
+
+  ;; (set-megatest-env-vars db run-id) ;; these may be needed by the launching process
+
   (change-directory *toppath*)
   (let* ((test-path    (conc *toppath* "/tests/" test-name)) ;; could use test:get-testconfig here ...
 	 (test-configf (conc test-path "/testconfig"))
 	 (testexists   (and (file-exists? test-configf)(file-read-access? test-configf)))
 	 (test-conf    (if testexists (read-config test-configf #f #t) (make-hash-table)))
@@ -831,12 +835,14 @@
 	 (keepgoing   (hash-table-ref/default flags "-keepgoing" #f))
 	 (test-names  '())
 	 (runconfigf   (conc  *toppath* "/runconfigs.config"))
 	 (required-tests '()))
 
+    (set-megatest-env-vars db run-id) ;; these may be needed by the launching process
+
     (if (file-exists? runconfigf)
-	(setup-env-defaults db runconfigf run-id *already-seen-runconfig-info*)
+	(setup-env-defaults db runconfigf run-id *already-seen-runconfig-info* "pre-launch-env-vars")
 	(debug:print 0 "WARNING: You do not have a run config file: " runconfigf))
     
     ;; look up all tests matching the comma separated list of globs in
     ;; test-patts (using % as wildcard)
     (for-each 
@@ -1195,12 +1201,12 @@
 	      (exit 1)))
 	(set! db   (open-db))
 	(set! keys (db-get-keys db))
 	;; have enough to process -target or -reqtarg here
 	(if (args:get-arg "-reqtarg")
-	    (let* ((runconfigf (conc  *toppath* "/runconfigs.config")) ;; evaluate all 
-		   (runconfig  (read-config runconfigf #f #f environ-patt: ".*"))) 
+	    (let* ((runconfigf (conc  *toppath* "/runconfigs.config")) ;; DO NOT EVALUATE ALL 
+		   (runconfig  (read-config runconfigf #f #f environ-patt: #f))) 
 	      (if (hash-table-ref/default runconfig (args:get-arg "-reqtarg") #f)
 		  (keys:target-set-args keys (args:get-arg "-reqtarg") args:arg-hash)
 		  (begin
 		    (debug:print 0 "ERROR: [" (args:get-arg "-reqtarg") "] not found in " runconfigf)
 		    (sqlite3:finalize! db)