73 files changed, 139 insertions, 138 deletions
diff --git a/tests/bash/testscript b/tests/bash/testscript
index 39f247b..11f50c7 100644
--- a/tests/bash/testscript
+++ b/tests/bash/testscript
@@ -11,7 +11,7 @@ if ($test.target == $build.host && $build.host.class != 'windows')
   buildfile = true
   test.arguments =
 
-  .include ../common.test
+  .include ../common.testscript
 
   +cat <<EOI >+build/bootstrap.build
     using test
diff --git a/tests/build/root.build b/tests/build/root.build
index 6e4fea9..749e6c3 100644
--- a/tests/build/root.build
+++ b/tests/build/root.build
@@ -13,7 +13,7 @@ cxx{*}: extension = cxx
 # as our $build.path).
 #
 import b = build2%exe{b}
-test{*}: test = $b
+testscript{*}: test = $b
 
 # Specify the test target for cross-testing.
 #
diff --git a/tests/buildfile b/tests/buildfile
index 092b2ad..e53cbc9 100644
--- a/tests/buildfile
+++ b/tests/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: {*/ -build/} file{common.test}
+./: {*/ -build/} file{common.testscript}
diff --git a/tests/cc/libu/testscript b/tests/cc/libu/testscript
index 4552141..66424b8 100644
--- a/tests/cc/libu/testscript
+++ b/tests/cc/libu/testscript
@@ -5,7 +5,7 @@
 crosstest = false
 test.arguments = config.cxx="$recall($cxx.path)"
 
-.include ../../common.test
+.include ../../common.testscript
 
 +cat <<EOI >+build/bootstrap.build
 using test
diff --git a/tests/cc/modules/testscript b/tests/cc/modules/testscript
index 4401bfd..ea7bd97 100644
--- a/tests/cc/modules/testscript
+++ b/tests/cc/modules/testscript
@@ -5,7 +5,7 @@
 crosstest = false
 test.arguments = config.cxx="$recall($cxx.path)"
 
-.include ../../common.test
+.include ../../common.testscript
 
 +cat <<EOI >+build/bootstrap.build
 using test
diff --git a/tests/cc/preprocessed/testscript b/tests/cc/preprocessed/testscript
index 2c20d3f..853d563 100644
--- a/tests/cc/preprocessed/testscript
+++ b/tests/cc/preprocessed/testscript
@@ -5,7 +5,7 @@
 crosstest = false
 test.arguments = config.cxx="$recall($cxx.path)" update
 
-.include ../../common.test
+.include ../../common.testscript
 
 # Trace filter.
 #
diff --git a/tests/common.test b/tests/common.testscript
index 586e793..369c798 100644
--- a/tests/common.test
+++ b/tests/common.testscript
@@ -1,4 +1,4 @@
-# file      : tests/common.test
+# file      : tests/common.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/tests/directive/assert.test b/tests/directive/assert.testscript
index 2d70573..ffe6aa0 100644
--- a/tests/directive/assert.test
+++ b/tests/directive/assert.testscript
@@ -1,8 +1,8 @@
-# file      : tests/directive/assert.test
+# file      : tests/directive/assert.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 $* <'assert true'                     : true
 $* <'assert! false foo'               : not-false
diff --git a/tests/directive/buildfile b/tests/directive/buildfile
index c03a08d..ac4c752 100644
--- a/tests/directive/buildfile
+++ b/tests/directive/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: test{*} $b
+./: testscript{*} $b
diff --git a/tests/directive/run.test b/tests/directive/run.testscript
index 30d4a6a..ba4a413 100644
--- a/tests/directive/run.test
+++ b/tests/directive/run.testscript
@@ -1,4 +1,4 @@
-# file      : tests/directive/run.test
+# file      : tests/directive/run.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
@@ -6,7 +6,7 @@
 #
 crosstest = false
 
-.include ../common.test
+.include ../common.testscript
 
 : no-output
 :
diff --git a/tests/eval/buildfile b/tests/eval/buildfile
index 8fa0064..f7fa2d5 100644
--- a/tests/eval/buildfile
+++ b/tests/eval/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: test{*} $b
+./: testscript{*} $b
diff --git a/tests/eval/comma.test b/tests/eval/comma.testscript
index 1a36dd1..bb748d1 100644
--- a/tests/eval/comma.test
+++ b/tests/eval/comma.testscript
@@ -1,10 +1,10 @@
-# file      : tests/eval/comma.test
+# file      : tests/eval/comma.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
 # Test value packs (eval-comma).
 
-.include ../common.test
+.include ../common.testscript
 
 : comma
 :
diff --git a/tests/eval/comp.test b/tests/eval/comp.testscript
index c1a4cf7..481c50b 100644
--- a/tests/eval/comp.test
+++ b/tests/eval/comp.testscript
@@ -1,10 +1,10 @@
-# file      : tests/eval/comp.test
+# file      : tests/eval/comp.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
 # Test comparison operators (eval-comp).
 
-.include ../common.test
+.include ../common.testscript
 
 $* <'print (foo == bar)' >'false' : eq-false
 $* <'print (foo == foo)' >'true'  : eq-true
diff --git a/tests/eval/or-and.test b/tests/eval/or-and.testscript
index 796f92a..7796f74 100644
--- a/tests/eval/or-and.test
+++ b/tests/eval/or-and.testscript
@@ -1,10 +1,10 @@
-# file      : tests/eval/or-and.test
+# file      : tests/eval/or-and.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
 # Test logical operators (eval-or, eval-and).
 
-.include ../common.test
+.include ../common.testscript
 
 $* <'print (false || false)' >'false' : or-false
 $* <'print (false || true)'  >'true'  : or-true-1
diff --git a/tests/eval/qual.test b/tests/eval/qual.testscript
index babd956..e7bf472 100644
--- a/tests/eval/qual.test
+++ b/tests/eval/qual.testscript
@@ -1,10 +1,10 @@
-# file      : tests/eval/qual.test
+# file      : tests/eval/qual.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
 # Test qualified name (eval-qual).
 
-.include ../common.test
+.include ../common.testscript
 
 $* <'print (file{foo}: bar)' >'file{foo}:bar' : target
 $* <'print (foo/dir{}: bar)' >'dir{foo/}:bar' : scope
diff --git a/tests/eval/ternary.test b/tests/eval/ternary.testscript
index a220110..fc405e5 100644
--- a/tests/eval/ternary.test
+++ b/tests/eval/ternary.testscript
@@ -1,10 +1,10 @@
-# file      : tests/eval/ternary.test
+# file      : tests/eval/ternary.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
 # Test the ternary operator (eval-ternary).
 
-.include ../common.test
+.include ../common.testscript
 
 $* <'print (true  ? foo : bar)' >'foo' : true
 $* <'print (false ? foo : bar)' >'bar' : false
diff --git a/tests/eval/value.test b/tests/eval/value.testscript
index a3e1d4c..7cae6e2 100644
--- a/tests/eval/value.test
+++ b/tests/eval/value.testscript
@@ -1,10 +1,10 @@
-# file      : tests/eval/value.test
+# file      : tests/eval/value.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
 # Test value part of the grammar (eval-value).
 
-.include ../common.test
+.include ../common.testscript
 
 $* <'print (foo)' >'foo'           : value
 $* <'print ()'    >''              : value-empty
diff --git a/tests/expansion/buildfile b/tests/expansion/buildfile
index c144c23..7a73b9d 100644
--- a/tests/expansion/buildfile
+++ b/tests/expansion/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: test{*} $b
+./: testscript{*} $b
diff --git a/tests/expansion/concat.test b/tests/expansion/concat.testscript
index baaf1e1..75487b5 100644
--- a/tests/expansion/concat.test
+++ b/tests/expansion/concat.testscript
@@ -1,10 +1,10 @@
-# file      : tests/expansion/type.test
+# file      : tests/expansion/type.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
 # Test concatenated expansion.
 
-.include ../common.test
+.include ../common.testscript
 
 : typed-exceptions
 :
diff --git a/tests/expansion/type.test b/tests/expansion/type.testscript
index 8899aa3..12204a3 100644
--- a/tests/expansion/type.test
+++ b/tests/expansion/type.testscript
@@ -1,10 +1,10 @@
-# file      : tests/expansion/type.test
+# file      : tests/expansion/type.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
 # Test type propagation during expansion.
 
-.include ../common.test
+.include ../common.testscript
 
 : var
 :
diff --git a/tests/function/builtin/testscript b/tests/function/builtin/testscript
index d15eeb3..e54fb0f 100644
--- a/tests/function/builtin/testscript
+++ b/tests/function/builtin/testscript
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../../common.test
+.include ../../common.testscript
 
 : type
 :
diff --git a/tests/function/filesystem/testscript b/tests/function/filesystem/testscript
index 7dcfde9..42c09db 100644
--- a/tests/function/filesystem/testscript
+++ b/tests/function/filesystem/testscript
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../../common.test
+.include ../../common.testscript
 
 : path-search
 :
diff --git a/tests/function/install/testscript b/tests/function/install/testscript
index 73aba00..e2afc39 100644
--- a/tests/function/install/testscript
+++ b/tests/function/install/testscript
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../../common.test
+.include ../../common.testscript
 
 +cat <<EOI >+build/bootstrap.build
 using config
diff --git a/tests/function/path/testscript b/tests/function/path/testscript
index 8446bf0..84a1cc1 100644
--- a/tests/function/path/testscript
+++ b/tests/function/path/testscript
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../../common.test
+.include ../../common.testscript
 
 s = ($cxx.target.class != 'windows' ? '/' : '\')
 
diff --git a/tests/function/process/testscript b/tests/function/process/testscript
index f01af6f..d4fe864 100644
--- a/tests/function/process/testscript
+++ b/tests/function/process/testscript
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../../common.test
+.include ../../common.testscript
 
 : run
 :
diff --git a/tests/function/regex/testscript b/tests/function/regex/testscript
index 28d6c8e..4d48e04 100644
--- a/tests/function/regex/testscript
+++ b/tests/function/regex/testscript
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../../common.test
+.include ../../common.testscript
 
 : replace
 :
diff --git a/tests/hooks/testscript b/tests/hooks/testscript
index f0d5c14..92c9964 100644
--- a/tests/hooks/testscript
+++ b/tests/hooks/testscript
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 +cat <'print bootstrap'  >+build/bootstrap.build
 +cat <'print root'       >=build/root.build
diff --git a/tests/in/testscript b/tests/in/testscript
index 3e06137..9b4b38a 100644
--- a/tests/in/testscript
+++ b/tests/in/testscript
@@ -5,7 +5,7 @@
 crosstest = false
 test.arguments =
 
-.include ../common.test
+.include ../common.testscript
 
 +cat <<EOI >=build/root.build
 using in
diff --git a/tests/loop/buildfile b/tests/loop/buildfile
index e583492..3807ddf 100644
--- a/tests/loop/buildfile
+++ b/tests/loop/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: test{*} $b
+./: testscript{*} $b
diff --git a/tests/loop/for.test b/tests/loop/for.testscript
index 66bfc80..6aec1b2 100644
--- a/tests/loop/for.test
+++ b/tests/loop/for.testscript
@@ -1,10 +1,10 @@
-# file      : tests/loop/for.test
+# file      : tests/loop/for.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
 # Test for-loop.
 
-.include ../common.test
+.include ../common.testscript
 
 : line
 :
diff --git a/tests/name/buildfile b/tests/name/buildfile
index 4449a1f..1253202 100644
--- a/tests/name/buildfile
+++ b/tests/name/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: test{*} $b
+./: testscript{*} $b
diff --git a/tests/name/cross.test b/tests/name/cross.testscript
index 009b851..d625a2c 100644
--- a/tests/name/cross.test
+++ b/tests/name/cross.testscript
@@ -1,8 +1,8 @@
-# file      : tests/name/cross.test
+# file      : tests/name/cross.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 +cat <<EOI >=build/root.build
 define foo: file
diff --git a/tests/name/extension.test b/tests/name/extension.testscript
index 160c427..f9df173 100644
--- a/tests/name/extension.test
+++ b/tests/name/extension.testscript
@@ -1,8 +1,8 @@
-# file      : tests/name/extension.test
+# file      : tests/name/extension.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 +cat <<EOI >=build/root.build
 define txt: file
@@ -31,8 +31,8 @@ EOI
 
   : specified-default
   :
-  touch foo.test.txt;
-  $* <'./: txt{foo.test...}'
+  touch foo.testscript.txt;
+  $* <'./: txt{foo.testscript...}'
 
   # Trailing dots are not allowed on Windows.
   #
@@ -70,8 +70,8 @@ EOI
 
   : specified-default
   :
-  touch foo.test.txt;
-  $* <'print txt{fo?.test...}' >'txt{foo.test...}'
+  touch foo.testscript.txt;
+  $* <'print txt{fo?.testscript...}' >'txt{foo.testscript...}'
 
   # Trailing dots are not allowed on Windows.
   #
diff --git a/tests/name/pattern.test b/tests/name/pattern.testscript
index 8d8840c..d40e3a4 100644
--- a/tests/name/pattern.test
+++ b/tests/name/pattern.testscript
@@ -1,8 +1,8 @@
-# file      : tests/name/pattern.test
+# file      : tests/name/pattern.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 +cat <<EOI >=build/root.build
 define txt: file
diff --git a/tests/search/dir/testscript b/tests/search/dir/testscript
index 24162d7..dc4b3a5 100644
--- a/tests/search/dir/testscript
+++ b/tests/search/dir/testscript
@@ -4,7 +4,7 @@
 
 test.arguments = 'update(../)'
 
-.include ../../common.test
+.include ../../common.testscript
 
 # foo/ has no buildfile
 # bar/ has valid buildfile
diff --git a/tests/test/buildfile b/tests/test/buildfile
index ae792ed..699dab9 100644
--- a/tests/test/buildfile
+++ b/tests/test/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: */ file{common.test}
+./: */ file{common.testscript}
diff --git a/tests/test/common.test b/tests/test/common.testscript
index ed87424..e659187 100644
--- a/tests/test/common.test
+++ b/tests/test/common.testscript
@@ -1,4 +1,4 @@
-# file      : tests/test/common.test
+# file      : tests/test/common.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
diff --git a/tests/test/config-test/testscript b/tests/test/config-test/testscript
index 7aadaf2..a9fba83 100644
--- a/tests/test/config-test/testscript
+++ b/tests/test/config-test/testscript
@@ -1,4 +1,4 @@
-# file      : tests/test/config-build/testscript
+# file      : tests/test/config-test/testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
@@ -44,9 +44,9 @@ EOI
 #
 +mkdir proj/tests/script
 +cat <<EOI >=proj/tests/script/buildfile
-./: test{basics.test}
+./: testscript{basics.testscript}
 EOI
-+cat <<EOI >=proj/tests/script/basics.test
++cat <<EOI >=proj/tests/script/basics.testscript
 echo 'tests/script/basics/foo' >| : foo
 echo 'tests/script/basics/bar' >| : bar
 
diff --git a/tests/test/script/buildfile b/tests/test/script/buildfile
index 4adc9d0..8878415 100644
--- a/tests/test/script/buildfile
+++ b/tests/test/script/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: */ file{common.test}
+./: */ file{common.testscript}
diff --git a/tests/test/script/builtin/buildfile b/tests/test/script/builtin/buildfile
index 7338d4c..83ecfd2 100644
--- a/tests/test/script/builtin/buildfile
+++ b/tests/test/script/builtin/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: test{*} file{cp-dir/cp-file} $b
+./: testscript{*} file{cp-dir/cp-file} $b
diff --git a/tests/test/script/builtin/cat.test b/tests/test/script/builtin/cat.testscript
index 69ff578..b72edb4 100644
--- a/tests/test/script/builtin/cat.test
+++ b/tests/test/script/builtin/cat.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/builtin/cat.test
+# file      : tests/test/script/builtin/cat.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 : in
 :
diff --git a/tests/test/script/builtin/cp.test b/tests/test/script/builtin/cp.testscript
index e81b395..e1b654f 100644
--- a/tests/test/script/builtin/cp.test
+++ b/tests/test/script/builtin/cp.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/builtin/cp.test
+# file      : tests/test/script/builtin/cp.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 : args
 :
diff --git a/tests/test/script/builtin/echo.test b/tests/test/script/builtin/echo.testscript
index 28647f4..235a9f7 100644
--- a/tests/test/script/builtin/echo.test
+++ b/tests/test/script/builtin/echo.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/builtin/echo.test
+# file      : tests/test/script/builtin/echo.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 : string
 :
diff --git a/tests/test/script/builtin/ln.test b/tests/test/script/builtin/ln.testscript
index 8b4c30e..5216d84 100644
--- a/tests/test/script/builtin/ln.test
+++ b/tests/test/script/builtin/ln.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/builtin/ln.test
+# file      : tests/test/script/builtin/ln.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 : args
 :
diff --git a/tests/test/script/builtin/mkdir.test b/tests/test/script/builtin/mkdir.testscript
index 92cd2e0..6b082bd 100644
--- a/tests/test/script/builtin/mkdir.test
+++ b/tests/test/script/builtin/mkdir.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/builtin/mkdir.test
+# file      : tests/test/script/builtin/mkdir.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 : dirs
 :
diff --git a/tests/test/script/builtin/mv.test b/tests/test/script/builtin/mv.testscript
index 291832e..321fee5 100644
--- a/tests/test/script/builtin/mv.test
+++ b/tests/test/script/builtin/mv.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/builtin/mv.test
+# file      : tests/test/script/builtin/mv.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 : args
 :
diff --git a/tests/test/script/builtin/rm.test b/tests/test/script/builtin/rm.testscript
index 3679ff1..3dd2674 100644
--- a/tests/test/script/builtin/rm.test
+++ b/tests/test/script/builtin/rm.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/builtin/rm.test
+# file      : tests/test/script/builtin/rm.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 : no-args
 :
diff --git a/tests/test/script/builtin/rmdir.test b/tests/test/script/builtin/rmdir.testscript
index 0e53bde..99dcaf1 100644
--- a/tests/test/script/builtin/rmdir.test
+++ b/tests/test/script/builtin/rmdir.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/builtin/rmdir.test
+# file      : tests/test/script/builtin/rmdir.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 : no-args
 :
diff --git a/tests/test/script/builtin/sed.test b/tests/test/script/builtin/sed.testscript
index 71824a1..9db7cb4 100644
--- a/tests/test/script/builtin/sed.test
+++ b/tests/test/script/builtin/sed.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/builtin/sed.test
+# file      : tests/test/script/builtin/sed.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 : arg
 :
diff --git a/tests/test/script/builtin/test.test b/tests/test/script/builtin/test.testscript
index 73d89bc..f49b92b 100644
--- a/tests/test/script/builtin/test.test
+++ b/tests/test/script/builtin/test.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/builtin/test.test
+# file      : tests/test/script/builtin/test.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 : file
 :
diff --git a/tests/test/script/builtin/touch.test b/tests/test/script/builtin/touch.testscript
index 04391bd..d58ed7f 100644
--- a/tests/test/script/builtin/touch.test
+++ b/tests/test/script/builtin/touch.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/builtin/touch.test
+# file      : tests/test/script/builtin/touch.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 : file
 :
diff --git a/tests/test/script/common.test b/tests/test/script/common.testscript
index bf9ebba..b509818 100644
--- a/tests/test/script/common.test
+++ b/tests/test/script/common.testscript
@@ -1,4 +1,4 @@
-# file      : tests/test/script/common.test
+# file      : tests/test/script/common.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
@@ -20,7 +20,7 @@ EOI
 +if! $empty($target)
   cat <<"EOI" >=build/root.build
   target = \$src_root/../../$string([name] $target)
-  test{*}: test = \$target
+  testscript{*}: test = \$target
   EOI
 end
 
@@ -32,5 +32,6 @@ end
 # automatically becoming dir{./}'s prerequisite.
 #
 c = cat >=testscript
-b = $0 --serial-stop --quiet --buildfile - test <"'test{testscript}: \$target'" \
+b = $0 --serial-stop --quiet --buildfile - test \
+<"'testscript{testscript}: \$target'" \
 &?test/***
diff --git a/tests/test/script/generated/testscript b/tests/test/script/generated/testscript
index 6f19fb1..0a28aa0 100644
--- a/tests/test/script/generated/testscript
+++ b/tests/test/script/generated/testscript
@@ -4,9 +4,9 @@
 
 test.arguments = test clean
 
-# Note: using common.test from test/, not script/.
+# Note: using common.testscript from test/, not script/.
 #
-.include ../../common.test
+.include ../../common.testscript
 
 # @@ in module
 #
diff --git a/tests/test/script/integration/testscript b/tests/test/script/integration/testscript
index 7176e0e..7bdad54 100644
--- a/tests/test/script/integration/testscript
+++ b/tests/test/script/integration/testscript
@@ -2,19 +2,19 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-# Note: using common.test from test/, not script/.
+# Note: using common.testscript from test/, not script/.
 #
-.include ../../common.test
+.include ../../common.testscript
 
 : script-files
 :
 {
-  +touch testscript foo.test bar.test
+  +touch testscript foo.testscript bar.testscript
 
   : testscript-and-other
   :
   $* <<EOI 2>>/EOE != 0
-  ./: ../testscript test{../foo}
+  ./: ../testscript testscript{../foo}
   EOI
   error: both 'testscript' and other names specified for dir{./}
   EOE
@@ -22,7 +22,7 @@
   : other-and-testscript
   :
   $* <<EOI 2>>/EOE != 0
-  ./: test{../foo} ../testscript
+  ./: testscript{../foo} ../testscript
   EOI
   error: both 'testscript' and other names specified for dir{./}
   EOE
@@ -30,7 +30,7 @@
   : others
   :
   $* <<EOI
-  ./: test{../foo ../bar}
+  ./: testscript{../foo ../bar}
   EOI
 }
 
@@ -39,31 +39,31 @@
 : Note that here we can not use portable path modifier as not all slashes are
 : path separators.
 :
-touch foo.test;
+touch foo.testscript;
 touch test;
 $* <<EOI 2>>~%EOE% != 0
-./: test{foo}
+./: testscript{foo}
 EOI
 %error: working directory test[/\\] is a file/symlink%
 EOE
 
 : wd-exists-before
 :
-touch foo.test;
+touch foo.testscript;
 mkdir test &!test/;
 $* <<EOI 2>>/EOE
-./: test{foo}
+./: testscript{foo}
 EOI
 warning: working directory test/ exists at the beginning of the test
 EOE
 
 : wd-not-empty-before
 :
-touch foo.test;
+touch foo.testscript;
 mkdir test &!test/;
 touch test/dummy &!test/dummy;
 $* <<EOI 2>>/EOE
-./: test{foo}
+./: testscript{foo}
 EOI
 warning: working directory test/ exists and is not empty at the beginning of the test
 EOE
@@ -76,11 +76,11 @@ EOE
 : scope. Also note that we still have to remove everything after detecting the
 : failure.
 :
-cat <<EOI >=foo.test;
+cat <<EOI >=foo.testscript;
 touch ../../dummy
 EOI
 $* <<EOI 2>>/EOE &test/*** != 0
-./: test{foo}
+./: testscript{foo}
 EOI
 error: working directory test/ is not empty at the end of the test
 EOE
diff --git a/tests/test/script/runner/buildfile b/tests/test/script/runner/buildfile
index 0067ec1..6e8bdd3 100644
--- a/tests/test/script/runner/buildfile
+++ b/tests/test/script/runner/buildfile
@@ -2,9 +2,9 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: test{*} exe{driver} $b
+./: testscript{*} exe{driver} $b
 
-test{*}: target = exe{driver}
+testscript{*}: target = exe{driver}
 
 import libs = libbutl%lib{butl}
 exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/test/script/runner/cleanup.test b/tests/test/script/runner/cleanup.testscript
index 2d99215..7ea1acd 100644
--- a/tests/test/script/runner/cleanup.test
+++ b/tests/test/script/runner/cleanup.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/runner/cleanup.test
+# file      : tests/test/script/runner/cleanup.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 b += --no-column
 
diff --git a/tests/test/script/runner/exit.test b/tests/test/script/runner/exit.testscript
index 7933203..9329ae4 100644
--- a/tests/test/script/runner/exit.test
+++ b/tests/test/script/runner/exit.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/runner/exit.test
+# file      : tests/test/script/runner/exit.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 : special
 :
@@ -75,7 +75,7 @@
 : execution
 :
 : Test that only expected commands are executed. Note that we rely on the fact
-: that their execution is performed serially (see ../common.test for details).
+: that their execution is performed serially (see ../common.testscript for details).
 :
 {
   : test-scope
diff --git a/tests/test/script/runner/expr.test b/tests/test/script/runner/expr.testscript
index cfc5277..36c15fd 100644
--- a/tests/test/script/runner/expr.test
+++ b/tests/test/script/runner/expr.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/runner/expr.test
+# file      : tests/test/script/runner/expr.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 : short-circuit
 :
diff --git a/tests/test/script/runner/if.test b/tests/test/script/runner/if.testscript
index f22f761..a625c34 100644
--- a/tests/test/script/runner/if.test
+++ b/tests/test/script/runner/if.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/runner/if.test
+# file      : tests/test/script/runner/if.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 : if-branch
 :
diff --git a/tests/test/script/runner/output.test b/tests/test/script/runner/output.testscript
index a83c092..ec9ff92 100644
--- a/tests/test/script/runner/output.test
+++ b/tests/test/script/runner/output.testscript
@@ -1,4 +1,4 @@
-# file      : tests/test/script/runner/output.test
+# file      : tests/test/script/runner/output.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
@@ -7,7 +7,7 @@
 # spread the feature tests among several places.
 #
 
-.include ../common.test
+.include ../common.testscript
 
 : after
 :
diff --git a/tests/test/script/runner/pipe.test b/tests/test/script/runner/pipe.testscript
index 03d8b2a..7ef5893 100644
--- a/tests/test/script/runner/pipe.test
+++ b/tests/test/script/runner/pipe.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/runner/pipe.test
+# file      : tests/test/script/runner/pipe.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 $c <'cat <foo | $* -i 1 >foo' && $b  : builtin-to-process
 $c <'$* -o foo | cat >foo' && $b     : process-to-builtin
diff --git a/tests/test/script/runner/redirect.test b/tests/test/script/runner/redirect.testscript
index 13d7219..21e9d07 100644
--- a/tests/test/script/runner/redirect.test
+++ b/tests/test/script/runner/redirect.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/runner/redirect.test
+# file      : tests/test/script/runner/redirect.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 b += --no-column
 
@@ -14,7 +14,7 @@ psr = ($cxx.target.class != 'windows' ? '/' : '\\') # Path separator in regex.
 {
   cat <'$* -i 1 -e bar <| >| 2>|' >=testscript;
   cat <<EOI >=buildfile;
-  test{testscript}: $target
+  testscript{testscript}: $target
   EOI
   $0 --serial-stop --quiet test <foo >foo 2>bar
 }
@@ -144,7 +144,7 @@ psr = ($cxx.target.class != 'windows' ? '/' : '\\') # Path separator in regex.
   : regex
   :
   : Test regex matching. Note that tests that check regex parsing are located
-  : in regex.test testscript.
+  : in regex.testscript.
   :
   {
     : match
@@ -401,7 +401,7 @@ psr = ($cxx.target.class != 'windows' ? '/' : '\\') # Path separator in regex.
   : regex
   :
   : Test regex matching. Note that tests that check regex parsing are located
-  : in regex.test testscript.
+  : in regex.testscript.
   :
   {
     : match
diff --git a/tests/test/script/runner/regex.test b/tests/test/script/runner/regex.testscript
index 018976c..46b1872 100644
--- a/tests/test/script/runner/regex.test
+++ b/tests/test/script/runner/regex.testscript
@@ -1,4 +1,4 @@
-# file      : tests/test/script/runner/regex.test
+# file      : tests/test/script/runner/regex.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
@@ -9,13 +9,13 @@
 #
 # Note that such a tests are separated from ones that check regex matching
 # specifically (in particular matching failures), The latest ones are located
-# in redirect.test testscript.
+# in redirect.testscript.
 #
 # Also note that the following tests are grouped by features: basic
 # functionality, flags, portable-path modifier.
 #
 
-.include ../common.test
+.include ../common.testscript
 
 : basic
 :
diff --git a/tests/test/script/runner/set.test b/tests/test/script/runner/set.testscript
index 2266ae9..b10ce1e 100644
--- a/tests/test/script/runner/set.test
+++ b/tests/test/script/runner/set.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/runner/set.test
+# file      : tests/test/script/runner/set.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 : special
 :
diff --git a/tests/test/script/runner/status.test b/tests/test/script/runner/status.testscript
index 86d9ca4..1689a69 100644
--- a/tests/test/script/runner/status.test
+++ b/tests/test/script/runner/status.testscript
@@ -1,8 +1,8 @@
-# file      : tests/test/script/runner/status.test
+# file      : tests/test/script/runner/status.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 b += --no-column
 
diff --git a/tests/test/simple/generated/testscript b/tests/test/simple/generated/testscript
index 61258b0..08bd3e3 100644
--- a/tests/test/simple/generated/testscript
+++ b/tests/test/simple/generated/testscript
@@ -4,7 +4,7 @@
 
 test.arguments = test clean
 
-.include ../../common.test
+.include ../../common.testscript
 
 # @@ in module
 #
diff --git a/tests/value/buildfile b/tests/value/buildfile
index 1ab26d5..a43074c 100644
--- a/tests/value/buildfile
+++ b/tests/value/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: test{*} $b
+./: testscript{*} $b
diff --git a/tests/value/concat.test b/tests/value/concat.testscript
index 79f004c..581c3ad 100644
--- a/tests/value/concat.test
+++ b/tests/value/concat.testscript
@@ -1,8 +1,8 @@
-# file      : tests/value/concat.test
+# file      : tests/value/concat.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../common.test
+.include ../common.testscript
 
 : dir_path
 :
diff --git a/tests/value/reverse.test b/tests/value/reverse.testscript
index 9ea9d09..6294d3f 100644
--- a/tests/value/reverse.test
+++ b/tests/value/reverse.testscript
@@ -1,11 +1,11 @@
-# file      : tests/value/reverse.test
+# file      : tests/value/reverse.testscript
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
 # Test reversal to canonical/original representation.
 #
 
-.include ../common.test
+.include ../common.testscript
 
 : name
 :
diff --git a/tests/variable/override/testscript b/tests/variable/override/testscript
index 591fc19..00ffdb9 100644
--- a/tests/variable/override/testscript
+++ b/tests/variable/override/testscript
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../../common.test
+.include ../../common.testscript
 
 : cache-invalidation
 :
diff --git a/tests/variable/prerequisite-specific/testscript b/tests/variable/prerequisite-specific/testscript
index d0ce5e0..1c7e7bd 100644
--- a/tests/variable/prerequisite-specific/testscript
+++ b/tests/variable/prerequisite-specific/testscript
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../../common.test
+.include ../../common.testscript
 
 # There is currently no support for expanding prerequisite-specific variables
 # (since there is no way to id a prerequisite) so we use dump.
diff --git a/tests/variable/scope-specific/testscript b/tests/variable/scope-specific/testscript
index 2f519d2..5f9a05d 100644
--- a/tests/variable/scope-specific/testscript
+++ b/tests/variable/scope-specific/testscript
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../../common.test
+.include ../../common.testscript
 
 : basic-line
 :
diff --git a/tests/variable/target-specific/testscript b/tests/variable/target-specific/testscript
index 8d9917c..497c863 100644
--- a/tests/variable/target-specific/testscript
+++ b/tests/variable/target-specific/testscript
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-.include ../../common.test
+.include ../../common.testscript
 
 : basic-line
 :