@@ -504,11 +504,13 @@
 (define (test:get-testconfig test-name system-allowed)
   (let* ((test-path    (conc *toppath* "/tests/" test-name))
 	 (test-configf (conc test-path "/testconfig"))
 	 (testexists   (and (file-exists? test-configf)(file-read-access? test-configf))))
     (if testexists
-	(read-config test-configf #f system-allowed)
+	(read-config test-configf #f system-allowed environ-patt: (if system-allowed
+								      "pre-launch-env-vars"
+								      #f))
 	#f)))
   
 ;; sort tests by priority and waiton
 ;; Move test specific stuff to a test unit FIXME one of these days
 (define (tests:sort-by-priority-and-waiton test-names)
@@ -1193,12 +1195,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"))
-		   (runconfig  (read-config runconfigf #f #f)))
+	    (let* ((runconfigf (conc  *toppath* "/runconfigs.config")) ;; evaluate all 
+		   (runconfig  (read-config runconfigf #f #f environ-patt: ".*"))) 
 	      (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)