diff --git a/tests/virsh-checkpoint b/tests/virsh-checkpoint
index 75bdc293be97c76fe0ce558efb82e3a928c2eccc..92962d2205158b9891a9a93428d64484eda8d473 100755
--- a/tests/virsh-checkpoint
+++ b/tests/virsh-checkpoint
@@ -140,7 +140,7 @@ EOF
 compare exp err || fail=1
 
 # Restore state with redefine
-$abs_top_builddir/tools/virsh -c test:///default >out 2>err <<EOF || fail=1
+$abs_top_builddir/tools/virsh -c test:///default >out 2>err '
   # Redefine must be in topological order; this will fail
   checkpoint-create test --redefine c2.xml
   echo --err marker
@@ -149,7 +149,7 @@ $abs_top_builddir/tools/virsh -c test:///default >out 2>err <<EOF || fail=1
   checkpoint-create test --redefine c2.xml
   checkpoint-list test --leaves --name
   checkpoint-info test c2
-EOF
+' || fail=1
 
 cat <<\EOF > exp || fail=1
 
@@ -165,8 +165,7 @@ Children:       0
 Descendants:    0
 
 EOF
-sed '1,/^virsh #/d; /virsh #/d' < out > out.cooked || fail=1
-compare exp out.cooked || fail=1
+compare exp out || fail=1
 
 cat <<EOF > exp || fail=1
 error: invalid argument: parent c3 for moment c2 not found
diff --git a/tests/virsh-snapshot b/tests/virsh-snapshot
index 20ff966a51c589858c9f4069229825d8581457a4..473e3b3f2d074ce653a37c7b253cefe79d061d01 100755
--- a/tests/virsh-snapshot
+++ b/tests/virsh-snapshot
@@ -191,7 +191,7 @@ EOF
 compare exp err || fail=1
 
 # Restore state with redefine
-$abs_top_builddir/tools/virsh -c test:///default >out 2>err <<EOF || fail=1
+$abs_top_builddir/tools/virsh -c test:///default >out 2>err '
   # Redefine must be in topological order; this will fail
   snapshot-create test --redefine s2.xml --validate
   echo --err marker
@@ -199,7 +199,7 @@ $abs_top_builddir/tools/virsh -c test:///default >out 2>err <<EOF || fail=1
   snapshot-create test --redefine s3.xml --validate
   snapshot-create test --redefine s2.xml --current --validate
   snapshot-info test --current
-EOF
+' || fail=1
 
 cat <<\EOF > exp || fail=1
 
@@ -217,8 +217,7 @@ Descendants:    0
 Metadata:       yes
 
 EOF
-sed '1,/^virsh #/d; /virsh #/d' < out > out.cooked || fail=1
-compare exp out.cooked || fail=1
+compare exp out || fail=1
 
 cat <<EOF > exp || fail=1
 error: invalid argument: parent s3 for moment s2 not found