@@ -85,14 +85,18 @@
 
     (configf:write-alist testconfig "testconfig.subrun")))
 
 (define (subrun:set-state-status test-run-dir state status new-state-status)
   (if (and (not (subrun:subrun-removed? test-run-dir)) (subrun:subrun-test-initialized? test-run-dir))
-      (let* ((log-prefix (subrun:sanitize-path
+      (let* ((action-switches-str
+              (conc "set-state-status="new-state-status
+                                (if state (conc " -state "state ""))
+                                (if status (conc " -status "status) "")))
+             (log-prefix (subrun:sanitize-path
                           (conc "set-state-status="new-state-status
-                                (if state (conc ":state="state "")
-                                    (if status (conc "+status="status) "")))))
+                                (if state (conc ":state="state ""))
+                                (if status (conc "+status="status) ""))))
              (submt-result 
               (subrun:exec-sub-megatest test-run-dir action-switches-str log-prefix)))
         submt-result)))
 
 (define (subrun:remove-subrun test-run-dir keep-records )