2 files changed, 2 insertions, 26 deletions
diff --git a/unit-tests/cc/lexer/buildfile b/unit-tests/cc/lexer/buildfile
index 17a91d0..8c20552 100644
--- a/unit-tests/cc/lexer/buildfile
+++ b/unit-tests/cc/lexer/buildfile
@@ -2,17 +2,5 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-#@@ Temporary until we get utility library support.
-#
-import libs = libbutl%lib{butl}
-src = cc/lexer token lexer diagnostics utility variable name b-options     \
-types-parsers context scope parser target operation rule prerequisite file \
-module function functions-builtin functions-filesystem functions-path      \
-functions-process-path functions-regex functions-string                    \
-functions-target-triplet algorithm search dump filesystem scheduler        \
-config/{utility init operation module} spec
-
-exe{driver}: {hxx cxx}{*} ../../../build2/cxx{$src} ../../../build2/liba{b} \
-             $libs test{*}
-
 include ../../../build2/
+exe{driver}: {hxx cxx}{*} ../../../build2/libu{b} test{*}
diff --git a/unit-tests/cc/parser/buildfile b/unit-tests/cc/parser/buildfile
index d919e2f..0c04bb1 100644
--- a/unit-tests/cc/parser/buildfile
+++ b/unit-tests/cc/parser/buildfile
@@ -2,17 +2,5 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-#@@ Temporary until we get utility library support.
-#
-import libs = libbutl%lib{butl}
-src = cc/{lexer parser} token lexer diagnostics utility variable name    \
-b-options types-parsers context scope parser target operation rule       \
-prerequisite file module function functions-builtin functions-filesystem \
-functions-path functions-process-path functions-regex functions-string   \
-functions-target-triplet algorithm search dump filesystem scheduler      \
-config/{utility init operation module} spec
-
-exe{driver}: {hxx cxx}{*} ../../../build2/cxx{$src} ../../../build2/liba{b} \
-             $libs test{*}
-
 include ../../../build2/
+exe{driver}: {hxx cxx}{*} ../../../build2/libu{b} test{*}