CURDIR=$(dirname $0)
TESTDIR=$CURDIR/..
-BABELTRACE_BIN=$CURDIR/../../converter/babeltrace
+BABELTRACE_BIN=$CURDIR/../../cli/babeltrace
-CTF_TRACES=@ABSTOPSRCDIR@/tests/ctf-traces
+CTF_TRACES=@abs_top_srcdir@/tests/ctf-traces
source $TESTDIR/utils/tap/tap.sh