6 files changed, 12 insertions, 8 deletions
diff --git a/tests/test/script/builtin/buildfile b/tests/test/script/builtin/buildfile
index 77d74cb..3d07a73 100644
--- a/tests/test/script/builtin/buildfile
+++ b/tests/test/script/builtin/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: test{cat echo mkdir rm touch}
+./: test{cat echo mkdir rm touch} $b
diff --git a/tests/test/script/builtin/cat.test b/tests/test/script/builtin/cat.test
index f94b7bd..edde422 100644
--- a/tests/test/script/builtin/cat.test
+++ b/tests/test/script/builtin/cat.test
@@ -1,4 +1,4 @@
-# file      : tests/test/script/runner/cat.test
+# file      : tests/test/script/builtin/cat.test
 # copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/tests/test/script/builtin/echo.test b/tests/test/script/builtin/echo.test
index 7f43aac..73bc480 100644
--- a/tests/test/script/builtin/echo.test
+++ b/tests/test/script/builtin/echo.test
@@ -1,11 +1,15 @@
-# file      : tests/test/script/runner/echo.test
+# file      : tests/test/script/builtin/echo.test
 # copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
+.include ../common.test
+
 : string
 :
-echo foo >foo
+$c <'echo foo >foo';
+$b
 
 : strings
 :
-echo foo bar >"foo bar"
+$c <'echo foo bar >"foo bar"';
+$b
diff --git a/tests/test/script/builtin/mkdir.test b/tests/test/script/builtin/mkdir.test
index 6b7b5c9..a8857c1 100644
--- a/tests/test/script/builtin/mkdir.test
+++ b/tests/test/script/builtin/mkdir.test
@@ -1,4 +1,4 @@
-# file      : tests/test/script/runner/mkdir.test
+# file      : tests/test/script/builtin/mkdir.test
 # copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/tests/test/script/builtin/rm.test b/tests/test/script/builtin/rm.test
index bb12827..cf5d2fa 100644
--- a/tests/test/script/builtin/rm.test
+++ b/tests/test/script/builtin/rm.test
@@ -1,4 +1,4 @@
-# file      : tests/test/script/runner/rm.test
+# file      : tests/test/script/builtin/rm.test
 # copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/tests/test/script/builtin/touch.test b/tests/test/script/builtin/touch.test
index 0f9e4ef..da9ed91 100644
--- a/tests/test/script/builtin/touch.test
+++ b/tests/test/script/builtin/touch.test
@@ -1,4 +1,4 @@
-# file      : tests/test/script/runner/touch.test
+# file      : tests/test/script/builtin/touch.test
 # copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file