@@ -930,10 +930,11 @@
           ;;(BB> "launch:setup-body -- 1 set! *configdat*="*configdat*)
 	  (set! *runconfigdat* (configf:read-alist rccachef))
 	  (set! *configinfo*   (list *configdat*  (get-environment-variable "MT_RUN_AREA_HOME")))
 	  (set! *configstatus* 'fulldata)
 	  (set! *toppath*      (get-environment-variable "MT_RUN_AREA_HOME"))
+	  (if (not (get-environment-variable "MT_TESTSUITE_NAME"))(set-env "MT_TESTSUITE_NAME" (common:get-testsuite-name)))
 	  *toppath*)
 	 ;; there are no existing cached configs, do full reads of the configs and cache them
 	 ;; we have all the info needed to fully process runconfigs and megatest.config
 	 ((and ;; (not force-reread) ;; force-reread is irrelevant in the AND, could however OR it?
 	       mtcachef
@@ -952,10 +953,11 @@
 					     toppath
 					     (get-environment-variable "MT_RUN_AREA_HOME"))
 					 "/runconfigs.config")
 				   *runconfigdat* #t 
 				   sections: sections))))
+	    (if (not (get-environment-variable "MT_TESTSUITE_NAME"))(set-env "MT_TESTSUITE_NAME" (common:get-testsuite-name))) ;; this should NOT be needed here
 	    (set! *runconfigdat* first-rundat)
 	    (if first-pass  ;; 
 		(begin
                   ;;(BB> "launch:setup-body -- \"first-pass\"=first-pass")
 		  (set! *configdat*  (car first-pass))
@@ -1012,10 +1014,11 @@
 
 	 ;; else read what you can and set the flag accordingly
 	 ;; here we don't have either mtconfig or rccachef
 	 (else
           ;;(BB> "launch:setup-body -- cond branch 3 - else")
+	  (if (not (get-environment-variable "MT_TESTSUITE_NAME"))(set-env "MT_TESTSUITE_NAME" (common:get-testsuite-name)))
 	  (let* ((cfgdat   (find-and-read-config 
 			    (or (args:get-arg "-config") "megatest.config")
 			    environ-patt: "env-override"
 			    given-toppath: (get-environment-variable "MT_RUN_AREA_HOME")
 			    pathenvvar: "MT_RUN_AREA_HOME")))