Index: src/tests/Makefile.am
===================================================================
--- src/tests/Makefile.am	(revision dccad9f1506435a7c66c88070d0515d927baa874)
+++ src/tests/Makefile.am	(revision 50697b0c1a5a7ab4634decc93217223196c5ccfe)
@@ -32,5 +32,5 @@
 	-XCFA \
 	-t \
-	-B${abs_top_builddir}/src/driver \
+	-B@DRIVER_DIR@ \
 	-g \
 	-Wall \
@@ -55,5 +55,5 @@
 endif
 
-CC = ${abs_top_builddir}/src/driver/cfa
+CC = @CFACC@
 
 .PHONY : list
Index: src/tests/Makefile.in
===================================================================
--- src/tests/Makefile.in	(revision dccad9f1506435a7c66c88070d0515d927baa874)
+++ src/tests/Makefile.in	(revision 50697b0c1a5a7ab4634decc93217223196c5ccfe)
@@ -181,9 +181,11 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
-CC = ${abs_top_builddir}/src/driver/cfa
+CC = @CFACC@
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
+CFACC = @CFACC@
+CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@
@@ -202,4 +204,5 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DRIVER_DIR = @DRIVER_DIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -298,8 +301,7 @@
 
 # applies to both programs
-AM_CFLAGS = $(if $(test), 2> $(test), ) -XCFA -t \
-	-B${abs_top_builddir}/src/driver -g -Wall -Wno-unused-function \
-	-quiet @CFA_FLAGS@ -I. -DIN_DIR="${srcdir}/.in/" \
-	-L${abs_top_builddir}/src/libcfa \
+AM_CFLAGS = $(if $(test), 2> $(test), ) -XCFA -t -B@DRIVER_DIR@ -g \
+	-Wall -Wno-unused-function -quiet @CFA_FLAGS@ -I. \
+	-DIN_DIR="${srcdir}/.in/" -L${abs_top_builddir}/src/libcfa \
 	-I${abs_top_srcdir}/src/libcfa \
 	-I${abs_top_srcdir}/src/libcfa/containers \
Index: src/tests/preempt_longrun/Makefile.in
===================================================================
--- src/tests/preempt_longrun/Makefile.in	(revision dccad9f1506435a7c66c88070d0515d927baa874)
+++ src/tests/preempt_longrun/Makefile.in	(revision 50697b0c1a5a7ab4634decc93217223196c5ccfe)
@@ -342,4 +342,6 @@
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
+CFACC = @CFACC@
+CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@
@@ -358,4 +360,5 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DRIVER_DIR = @DRIVER_DIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@