diff --git a/tests/kdc/check-iprop.in b/tests/kdc/check-iprop.in
index 90814d152..195214c0f 100644
--- a/tests/kdc/check-iprop.in
+++ b/tests/kdc/check-iprop.in
@@ -34,12 +34,17 @@
 # $Id$
 #
 
-srcdir="@srcdir@"
+top_builddir="@top_builddir@"
+env_setup="@env_setup@"
 objdir="@objdir@"
+srcdir="@srcdir@"
 EGREP="@EGREP@"
 
+. ${env_setup}
+
 # If there is no useful db support compile in, disable test
-../db/have-db || exit 77
+${have_db} || exit 77
+
 
 # Dont run this test in AFS, since it lacks support for AF_UNIX
 expr "X`/bin/pwd || pwd`" : "X/afs/.*" > /dev/null 2>/dev/null && exit 77
@@ -52,13 +57,9 @@ cache="FILE:${objdir}/cache.krb5"
 keytabfile=${objdir}/iprop.keytab
 keytab="FILE:${keytabfile}"
 
-kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port"
-kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -r $R"
-ipropdslave="${TESTS_ENVIRONMENT} ../../lib/kadm5/ipropd-slave"
-ipropdmaster="${TESTS_ENVIRONMENT} ../../lib/kadm5/ipropd-master"
-iproplog="${TESTS_ENVIRONMENT} ../../lib/kadm5/iprop-log"
-
-kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache --no-afslog"
+kdc="${kdc} --addresses=localhost -P $port"
+kadmin="${kadmin} -r $R"
+kinit="${kinit} -c $cache --no-afslog"
 
 KRB5_CONFIG="${objdir}/krb5.conf"
 export KRB5_CONFIG
@@ -100,21 +101,21 @@ echo Starting kdc
 ${kdc} &
 kdcpid=$!
 
-sh ${srcdir}/wait-kdc.sh || exit 1
+sh ${wait_kdc} || exit 1
 
 echo "starting master"
-MallocStackLogging=1 MallocStackLoggingNoCompact=1 MallocErrorAbort=1 MallocLogFile=${objdir}/malloc-log-master \
-${ipropdmaster} --hostname=localhost -k ${keytab} \
+env ${HEIM_MALLOC_DEBUG} \
+${ipropd_master} --hostname=localhost -k ${keytab} \
     --database=${objdir}/current-db &
 ipdm=$!
-sh ${srcdir}/wait-kdc.sh ipropd-master || exit 1
+sh ${wait_kdc} ipropd-master || exit 1
 
 echo "starting slave"
-MallocStackLogging=1 MallocStackLoggingNoCompact=1 MallocErrorAbort=1 MallocLogFile=${objdir}/malloc-log-slave \
+env ${HEIM_MALLOC_DEBUG} \
 KRB5_CONFIG="${objdir}/krb5-slave.conf" \
-${ipropdslave} --hostname=slave.test.h5l.se -k ${keytab} localhost &
+${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} localhost &
 ipds=$!
-sh ${srcdir}/wait-kdc.sh ipropd-slave || exit 1
+sh ${wait_kdc} ipropd-slave || exit 1
 
 echo "checking slave is up"
 ${EGREP} 'iprop/slave.test.h5l.se@TEST.H5L.SE.*Up' iprop-stats >/dev/null || exit 1
@@ -143,7 +144,7 @@ ${kadmin} -l get host/bar@${R} > /dev/null 2>/dev/null && exit 1
 
 echo "kill slave"
 > iprop-stats
-sh ${srcdir}/leaks-kill.sh ipropd-slave $ipds || exit 1
+sh ${leaks_kill} ipropd-slave $ipds || exit 1
 sleep 2
 
 ${EGREP} 'iprop/slave.test.h5l.se@TEST.H5L.SE.*Down' iprop-stats >/dev/null || exit 1
@@ -162,11 +163,11 @@ cp ${objdir}/current.log ${objdir}/current.log.tmp
 echo "starting slave again"
 > iprop-stats
 > messages.log
-MallocStackLogging=1 MallocStackLoggingNoCompact=1 MallocErrorAbort=1 MallocLogFile=${objdir}/malloc-log-slave \
+env ${HEIM_MALLOC_DEBUG} \
 KRB5_CONFIG="${objdir}/krb5-slave.conf" \
-${ipropdslave} --hostname=slave.test.h5l.se -k ${keytab} localhost &
+${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} localhost &
 ipds=$!
-sh ${srcdir}/wait-kdc.sh ipropd-slave || exit 1
+sh ${wait_kdc} ipropd-slave || exit 1
 
 echo "checking slave is up again"
 ${EGREP} 'iprop/slave.test.h5l.se@TEST.H5L.SE.*Up' iprop-stats >/dev/null || exit 1
@@ -174,17 +175,17 @@ echo "checking for replay problems"
 ${EGREP} 'Entry already exists in database' messages.log && exit 1
 
 echo "kill slave and remove log and database"
-sh ${srcdir}/leaks-kill.sh ipropd-slave $ipds || exit 1
+sh ${leaks_kill} ipropd-slave $ipds || exit 1
 sleep 2
 
 rm current.slave.log current-db.slave* || exit 1
 > iprop-stats
 > messages.log
-MallocStackLogging=1 MallocStackLoggingNoCompact=1 MallocErrorAbort=1 MallocLogFile=${objdir}/malloc-log-slave \
+env ${HEIM_MALLOC_DEBUG} \
 KRB5_CONFIG="${objdir}/krb5-slave.conf" \
-${ipropdslave} --hostname=slave.test.h5l.se -k ${keytab} localhost &
+${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} localhost &
 ipds=$!
-sh ${srcdir}/wait-kdc.sh ipropd-slave || exit 1
+sh ${wait_kdc} ipropd-slave || exit 1
 
 echo "checking slave is up again"
 ${EGREP} 'iprop/slave.test.h5l.se@TEST.H5L.SE.*Up' iprop-stats >/dev/null || exit 1
@@ -197,20 +198,20 @@ ${kadmin} -l cpw --random-password user@${R} > /dev/null || exit 1
 sleep 2
 
 echo "live truncate on master log"
-${iproplog} truncate || exit 1
+${iprop_log} truncate || exit 1
 sleep 2
 
 echo "Killing master and slave"
-sh ${srcdir}/leaks-kill.sh ipropd-master $ipdm || exit 1
-sh ${srcdir}/leaks-kill.sh ipropd-slave $ipds || exit 1
+sh ${leaks_kill} ipropd-master $ipdm || exit 1
+sh ${leaks_kill} ipropd-slave $ipds || exit 1
 
 #sleep 2
 #${EGREP} "^master down at " iprop-stats > /dev/null || exit 1
 
 echo "compare versions on master and slave logs"
 KRB5_CONFIG=${objdir}/krb5-slave.conf \
-${iproplog} last-version > slave-last.tmp
-${iproplog} last-version > master-last.tmp
+${iprop_log} last-version > slave-last.tmp
+${iprop_log} last-version > master-last.tmp
 cmp master-last.tmp slave-last.tmp || exit 1
 
 # ----------------- checking: master going backward
@@ -221,18 +222,18 @@ echo "Going back to old version of the master log file"
 cp ${objdir}/current.log.tmp ${objdir}/current.log
 
 echo "starting master"
-MallocStackLogging=1 MallocStackLoggingNoCompact=1 MallocErrorAbort=1 MallocLogFile=${objdir}/malloc-log-master \
-${ipropdmaster} --hostname=localhost -k ${keytab} \
+env ${HEIM_MALLOC_DEBUG} \
+${ipropd_master} --hostname=localhost -k ${keytab} \
     --database=${objdir}/current-db &
 ipdm=$!
-sh ${srcdir}/wait-kdc.sh ipropd-master || exit 1
+sh ${wait_kdc} ipropd-master || exit 1
 
 echo "starting slave"
-MallocStackLogging=1 MallocStackLoggingNoCompact=1 MallocErrorAbort=1 MallocLogFile=${objdir}/malloc-log-slave \
+env ${HEIM_MALLOC_DEBUG} \
 KRB5_CONFIG="${objdir}/krb5-slave.conf" \
-${ipropdslave} --hostname=slave.test.h5l.se -k ${keytab} localhost &
+${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} localhost &
 ipds=$!
-sh ${srcdir}/wait-kdc.sh ipropd-slave || exit 1
+sh ${wait_kdc} ipropd-slave || exit 1
 
 echo "checking slave is up again"
 ${EGREP} 'iprop/slave.test.h5l.se@TEST.H5L.SE.*Up' iprop-stats >/dev/null || exit 1
@@ -244,7 +245,7 @@ ${kadmin} -l cpw --random-password user@${R} > /dev/null || exit 1
 sleep 2
 
 echo "Killing master"
-sh ${srcdir}/leaks-kill.sh ipropd-master $ipdm || exit 1
+sh ${leaks_kill} ipropd-master $ipdm || exit 1
 
 sleep 4
 
@@ -257,18 +258,18 @@ echo "probing for slave pid"
 kill -0 ${ipds}  || { echo "slave no longer there"; exit 1; }
 
 echo "Staring master again"
-MallocStackLogging=1 MallocStackLoggingNoCompact=1 MallocErrorAbort=1 MallocLogFile=${objdir}/malloc-log-master \
-${ipropdmaster} --hostname=localhost -k ${keytab} \
+env ${HEIM_MALLOC_DEBUG} \
+${ipropd_master} --hostname=localhost -k ${keytab} \
     --database=${objdir}/current-db &
 ipdm=$!
-sh ${srcdir}/wait-kdc.sh ipropd-master || exit 1
+sh ${wait_kdc} ipropd-master || exit 1
 
 echo "probing for slave pid"
 kill -0 ${ipds}  || { echo "slave no longer there"; exit 1; }
 
-sh ${srcdir}/wait-kdc.sh ipropd-slave messages.log "connection successful to master" || exit 1
+sh ${wait_kdc} ipropd-slave messages.log "connection successful to master" || exit 1
 
-sh ${srcdir}/wait-kdc.sh ipropd-slave messages.log "ipropd-slave started at version" || exit 1
+sh ${wait_kdc} ipropd-slave messages.log "ipropd-slave started at version" || exit 1
 
 echo "pushing one change"
 ${kadmin} -l cpw --random-password user@${R} > /dev/null || exit 1
@@ -277,14 +278,14 @@ sleep 2
 echo "shutting down all services"
 
 trap "" EXIT
-sh ${srcdir}/leaks-kill.sh kdc $kdcpid || exit 1
-sh ${srcdir}/leaks-kill.sh ipropd-master $ipdm || exit 1
-sh ${srcdir}/leaks-kill.sh ipropd-slave $ipds || exit 1
+sh ${leaks_kill} kdc $kdcpid || exit 1
+sh ${leaks_kill} ipropd-master $ipdm || exit 1
+sh ${leaks_kill} ipropd-slave $ipds || exit 1
 
 echo "compare versions on master and slave logs"
 KRB5_CONFIG=${objdir}/krb5-slave.conf \
-${iproplog} last-version > slave-last.tmp
-${iproplog} last-version > master-last.tmp
+${iprop_log} last-version > slave-last.tmp
+${iprop_log} last-version > master-last.tmp
 cmp master-last.tmp slave-last.tmp || exit 1
 
 exit $ec