@@ -796,11 +796,10 @@
 			    (if ush 
 				(if (equal? ush "no") ;; must use "no" to NOT use shell
 				    #f
 				    ush)
 				#t)))     ;; default is yes
-	 (launcher        (config-lookup *configdat* "jobtools"     "launcher"))
 	 (runscript       (config-lookup test-conf   "setup"        "runscript"))
 	 (ezsteps         (> (length (hash-table-ref/default test-conf "ezsteps" '())) 0)) ;; don't send all the steps, could be big
 	 (diskspace       (config-lookup test-conf   "requirements" "diskspace"))
 	 (memory          (config-lookup test-conf   "requirements" "memory"))
 	 (hosts           (config-lookup *configdat* "jobtools"     "workhosts"))
@@ -818,11 +817,12 @@
 				  (case (string->symbol exe)
 				    ((dboard)    "../megatest")
 				    ((mtest)     "../megatest")
 				    ((dashboard) "megatest")
 				    (else exe)))))
-	 (item-path  (item-list->path itemdat))
+	 (item-path       (item-list->path itemdat))
+	 (launcher        (common:get-launcher *configdat* test-name item-path)) ;; (config-lookup *configdat* "jobtools"     "launcher"))
 	 (test-sig   (conc test-name ":" item-path)) ;; (item-list->path itemdat))) ;; test-path is the full path including the item-path
 	 (work-area  #f)
 	 (toptest-work-area #f) ;; for iterated tests the top test contains data relevant for all
 	 (diskpath   #f)
 	 (cmdparms   #f)