-LOG_DRIVER_FLAGS = '--merge'
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/config/tap-driver.sh
-
-TESTS = $(TESTS_BINDINGS) $(TESTS_CLI) $(TESTS_LIB) \
+LOG_DRIVER_FLAGS = --merge --comments
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' \
+ BT_TESTS_SRCDIR='$(abs_top_srcdir)/tests' \
+ BT_TESTS_BUILDDIR='$(abs_top_builddir)/tests' \
+ BT_TESTS_AWK_BIN="$(AWK)" \
+ BT_TESTS_GREP_BIN="$(GREP)" \
+ BT_TESTS_PYTHON_BIN="$(PYTHON)" \
+ BT_TESTS_SED_BIN="$(SED)" \
+ $(SHELL) $(top_srcdir)/config/tap-driver.sh
+
+TESTS = $(TESTS_BINDINGS) $(TESTS_CLI) $(TESTS_CTF_WRITER) $(TESTS_LIB) \