-LOG_DRIVER_FLAGS='--merge'
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
- $(srcdir)/utils/tap-driver.sh
+SUBDIRS = utils unit compile benchmark regression
+
+LOG_DRIVER_FLAGS = --merge --comments
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' \
+ UST_TESTS_SRCDIR='$(abs_top_srcdir)/tests' \
+ UST_TESTS_BUILDDIR='$(abs_top_builddir)/tests' \
+ $(SHELL) $(srcdir)/utils/tap-driver.sh
+
+# Unit tests