4 files changed, 12 insertions, 20 deletions
diff --git a/tests/buildfile b/tests/buildfile
deleted file mode 100644
index 3c57ff9..0000000
--- a/tests/buildfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# file      : tests/buildfile
-# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-d = load/ web/
-./: $d
-include $d
diff --git a/tests/load/buildfile b/tests/load/buildfile
index 6b81346..9338f32 100644
--- a/tests/load/buildfile
+++ b/tests/load/buildfile
@@ -9,13 +9,14 @@ import libs += libodb%lib{odb}
 
 include ../../libbrep/
 
-exe{driver}: cxx{driver} ../../libbrep/lib{brep} $libs
+./: exe{driver} file{loadtab cert *.pem openssl.cnf */**}
 
-# Disable for now until build2 test module supports running custom
-# commands, pre/post steps.
+exe{driver}: cxx{*} ../../libbrep/lib{brep} $libs
+
+# Disable until testscript is implemented.
 #
 exe{driver}: test = false
 
-# precondition: PostgreSQL server running port 8432 with brep schema created.
+# precondition: the environment is setup according to INSTALL-DEV file.
 # test:
-# ./driver ../../load/brep-load --db-host localhost --db-port 8432 ./loadtab
+# ./driver ../../load/brep-load --bpkg ../../../bpkg/bpkg/bpkg ./loadtab
diff --git a/tests/web/buildfile b/tests/web/buildfile
deleted file mode 100644
index 76e8a80..0000000
--- a/tests/web/buildfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# file      : tests/web/buildfile
-# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-d = xhtml/
-./: $d
-include $d
diff --git a/tests/web/xhtml/buildfile b/tests/web/xhtml/buildfile
index 8822869..bdfd7d6 100644
--- a/tests/web/xhtml/buildfile
+++ b/tests/web/xhtml/buildfile
@@ -4,5 +4,10 @@
 
 import libs = libstudxml%lib{studxml}
 
-exe{driver}: cxx{driver} $libs
+exe{driver}: cxx{*} $libs
 exe{driver}: test.output = test.out
+
+# @@ The rule doesn't trigger the target generating. Will be fixed when we add
+#    support for utility library.
+#
+../../../web/hxx{version}: ../../../web/in{version} $src_root/file{manifest}