6 files changed, 15 insertions, 16 deletions
diff --git a/tests/expansion/type.test b/tests/expansion/type.test
index 1aae5b6..d524eea 100644
--- a/tests/expansion/type.test
+++ b/tests/expansion/type.test
@@ -10,30 +10,30 @@
 :
 $* <<EOI
 x = [bool] true
-y = \$x
-assert \(\$type\(\$y) == bool)
+y = $x
+assert ($type($y) == bool)
 EOI
 
 : eval
 :
 $* <<EOI
-y = \([bool] true)
-assert \(\$type\(\$y) == bool)
+y = ([bool] true)
+assert ($type($y) == bool)
 EOI
 
 : func
 :
 $* <<EOI
-y = \$identity\([bool] true)
-assert \(\$type\(\$y) == bool)
+y = $identity([bool] true)
+assert ($type($y) == bool)
 EOI
 
 : untypify
 :
 $* <<EOI
 x = [bool] true
-y = "\$x"
-assert \(\$type\(\$y) == "")
+y = "$x"
+assert ($type($y) == "")
 EOI
 
 : type-conflict
diff --git a/tests/function/builtin/testscript b/tests/function/builtin/testscript
index 1a4c5d1..6491a60 100644
--- a/tests/function/builtin/testscript
+++ b/tests/function/builtin/testscript
@@ -36,7 +36,7 @@ test.options += -q --buildfile - noop
 {
   $* <<EOI     >'true'                       : empty-untyped
   x =
-  print \$empty\(\$x)
+  print $empty($x)
   EOI
 
   $* <'print $empty([string])'     >'true'   : empty-typed
diff --git a/tests/function/path/testscript b/tests/function/path/testscript
index e1b08af..0f83ad6 100644
--- a/tests/function/path/testscript
+++ b/tests/function/path/testscript
@@ -34,6 +34,6 @@ if ($cxx.target.class != windows) # @@ TMP ternarry
 else
   p = c:/../foo
 end;
-$* <"\$path.normalize\('$p')" 2>>EOE != 0
+$* <"\$path.normalize\('$p')" 2>>"EOE" != 0
 error: invalid path: '$p'
 EOE
diff --git a/tests/test/script/integration/testscript b/tests/test/script/integration/testscript
index b927fe8..93ce08a 100644
--- a/tests/test/script/integration/testscript
+++ b/tests/test/script/integration/testscript
@@ -69,8 +69,7 @@ touch test/dummy &!test/dummy;
 $* <<EOI 2>>EOE
 ./: test{foo}
 EOI
-warning: working directory test/ exists and is not empty at the beginning \
-of the test
+warning: working directory test/ exists and is not empty at the beginning of the test
 EOE
 
 : wd-not-empty-after
diff --git a/tests/test/script/runner/cleanup.test b/tests/test/script/runner/cleanup.test
index 474ce48..e6cefd5 100644
--- a/tests/test/script/runner/cleanup.test
+++ b/tests/test/script/runner/cleanup.test
@@ -49,7 +49,7 @@ rm a
 : Test that file append redirect doesn't not register cleanup. If it did, that
 : cleanup would fail as the file would be already deleted by 'rm'.
 :
-$c <<EOI;
+$c <<"EOI";
 touch a &!a;
 $* -o foo >>>&a;
 rm a
@@ -222,7 +222,7 @@ EOE
 :
 : Test an explicit cleanup not being overwritten with the implicit one.
 :
-$c <<EOO;
+$c <<"EOO";
 $* &!a;
 $* -o foo >>>a
 EOO
diff --git a/tests/test/script/runner/status.test b/tests/test/script/runner/status.test
index f1a20ec..716f2d4 100644
--- a/tests/test/script/runner/status.test
+++ b/tests/test/script/runner/status.test
@@ -36,13 +36,13 @@ $b
 : eq-false
 :
 $c <"$* -s 1 == 0";
-$b 2>>EOE != 0
+$b 2>>"EOE" != 0
 testscript:1: error: ../../../driver$ext exit status 1 != 0
 EOE
 
 : ne-false
 :
 $c <"$* -s 1 != 1";
-$b 2>>EOE != 0
+$b 2>>"EOE" != 0
 testscript:1: error: ../../../driver$ext exit status 1 == 1
 EOE