@@ -102,10 +102,13 @@
 			(get-environment-variable "MT_TARGET")))
 	 (keys      (if inkeys    inkeys    (rmt:get-keys)))
 	 (keyvals   (if inkeyvals inkeyvals (keys:target->keyval keys target)))
 	 (vals      (hash-table-ref/default *env-vars-by-run-id* run-id #f))
 	 (link-tree (configf:lookup *configdat* "setup" "linktree")))
+    (if testname (setenv "MT_TEST_NAME" testname))
+    (if itempath (setenv "MT_ITEMPATH"  itempath))
+
     ;; get the info from the db and put it in the cache
     (if link-tree
 	(setenv "MT_LINKTREE" link-tree)
 	(debug:print 0 "ERROR: linktree not set, should be set in megatest.config in [setup] section."))
     (if (not vals)
@@ -1329,14 +1332,14 @@
 		      "\nTESTNAME: " full-test-name 
 		      "\n   test-config: " (hash-table->alist test-conf)
 		      "\n   itemdat: " itemdat
 		      )
     (debug:print 2 "Attempting to launch test " full-test-name)
-    (setenv "MT_TEST_NAME" test-name) ;; 
-    (setenv "MT_ITEMPATH"  item-path)
-    (setenv "MT_RUNNAME"   runname)
-    (runs:set-megatest-env-vars run-id inrunname: runname) ;; these may be needed by the launching process
+    ;; (setenv "MT_TEST_NAME" test-name) ;; 
+    ;; (setenv "MT_ITEMPATH"  item-path)
+    ;; (setenv "MT_RUNNAME"   runname)
+    (runs:set-megatest-env-vars run-id inrunname: runname testname: test-name itempath: item-path) ;; these may be needed by the launching process
     (change-directory *toppath*)
 
     ;; Here is where the test_meta table is best updated
     ;; Yes, another use of a global for caching. Need a better way?
     ;;