diff --git a/services/mgmt/node/impl/impl_test.go b/services/mgmt/node/impl/impl_test.go
index 1e81371..57032a2 100644
--- a/services/mgmt/node/impl/impl_test.go
+++ b/services/mgmt/node/impl/impl_test.go
@@ -7,7 +7,6 @@
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"regexp"
 	"strings"
 	"syscall"
 	"testing"
@@ -110,9 +109,9 @@
 func generateEnvelope() *application.Envelope {
 	envelope := &application.Envelope{}
 	envelope.Args = os.Args[1:]
-	re := regexp.MustCompile("^([^=]*)=(.*)$")
 	for _, env := range os.Environ() {
-		envelope.Env = append(envelope.Env, re.ReplaceAllString(env, "$1=\"$2\""))
+		i := strings.Index(env, "=")
+		envelope.Env = append(envelope.Env, fmt.Sprintf("%s=%q", env[:i], env[i+1:]))
 	}
 	return envelope
 }
diff --git a/services/mgmt/node/impl/invoker.go b/services/mgmt/node/impl/invoker.go
index 77744a3..819bf73 100644
--- a/services/mgmt/node/impl/invoker.go
+++ b/services/mgmt/node/impl/invoker.go
@@ -420,7 +420,6 @@
 		vlog.Errorf("WriteFile(%v) failed: %v", path, err)
 		return errOperationFailed
 	}
-	vlog.VI(1).Infof("%s", output)
 	return nil
 }