diff --git a/CEP/BB/BBS3/test/tBBS3.run b/CEP/BB/BBS3/test/tBBS3.run
index d623285cc9c18923cbcac49c520dbc07a5892b1b..c08dae09de279aeeb32e40b36543391e34fbda12 100755
--- a/CEP/BB/BBS3/test/tBBS3.run
+++ b/CEP/BB/BBS3/test/tBBS3.run
@@ -23,5 +23,5 @@ ln -s $cdir/demo.MEP /tmp/test.demo3-1.MEP
 echo "  Preparing BlackBoard ..."
 time prepareBBD >> test.log
 echo "  Starting solve ..."
-time tBBS3 tBBS3.in 3 >& test.out
+time $LOFAR_CHECKTOOL tBBS3 tBBS3.in 3 >& test.out
 
diff --git a/CEP/BB/BBS3/test/tCorrect.run b/CEP/BB/BBS3/test/tCorrect.run
index 660b669392757fcc1fb3a3bfdf099495e321dcee..c3aa0d59ea0c14132f07cbe56a21a9b2bf7178d5 100755
--- a/CEP/BB/BBS3/test/tCorrect.run
+++ b/CEP/BB/BBS3/test/tCorrect.run
@@ -5,7 +5,7 @@ cp -r /data/PSS3/diepen/BBS2/demo3.MS_p1 /tmp/$USER.demo
 cp -r /data/PSS3/diepen/BBS2/demo3_corr.MEP /tmp/$USER.demo.MEP
 cp -r /data/PSS3/diepen/BBS2/demo3_gsm.MEP_tPredict /tmp/$USER.demo_gsm.MEP
 
-./tCorrect $USER /tmp/$USER.demo /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP
+$LOFAR_CHECKTOOL ./tCorrect $USER /tmp/$USER.demo /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP
 status=$?
 #\rm -rf /tmp/$USER.demo*
 exit $status
diff --git a/CEP/BB/BBS3/test/tMSData.run b/CEP/BB/BBS3/test/tMSData.run
index 592830eb2f2e52cb0e60a21d3b2608fe5e148f96..7dafc63b89a09a5eb1c015a550faa2bb6592a96c 100755
--- a/CEP/BB/BBS3/test/tMSData.run
+++ b/CEP/BB/BBS3/test/tMSData.run
@@ -5,12 +5,12 @@ cp -r /data/PSS3/diepen/BBS2/demo3.MEP /tmp/$USER.demo.MEP
 cp -r /data/PSS3/diepen/BBS2/demo3_gsm.MEP /tmp/$USER.demo_gsm.MEP
 
 ln -s /data/PSS3/diepen/BBS2/demo3.MS_p1 /tmp/$USER.demo
-./tMSData /data/PSS3/diepen/BBS2/demo3.MS $USER /tmp/$USER.demo /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP 100 MODEL_DATA
+$LOFAR_CHECKTOOL ./tMSData /data/PSS3/diepen/BBS2/demo3.MS $USER /tmp/$USER.demo /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP 100 MODEL_DATA
 status=$?
 
 \rm -rf /tmp/$USER.demo
 ln -s /data/PSS3/diepen/BBS2/3C343/10008336.MS_p1 /tmp/$USER.demo
-./tMSData /data/PSS3/diepen/BBS2/3C343/10008336.MS $USER /tmp/$USER.demo /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP 14 DATA
+$LOFAR_CHECKTOOL ./tMSData /data/PSS3/diepen/BBS2/3C343/10008336.MS $USER /tmp/$USER.demo /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP 14 DATA
 
 #\rm -rf /tmp/$USER.demo*
 exit $status
diff --git a/CEP/BB/BBS3/test/tPerturbed.run b/CEP/BB/BBS3/test/tPerturbed.run
index 9d8ad2fc1c4542fba979466bd32d6255d496e699..991d7a646c890b24c48734de8e9069d154a6e03f 100755
--- a/CEP/BB/BBS3/test/tPerturbed.run
+++ b/CEP/BB/BBS3/test/tPerturbed.run
@@ -2,22 +2,22 @@
 
 BASEDIR=/data/PSS3/diepen/BBS2
 
-./tPerturbed $USER $BASEDIR/demo3.MS_p1 $BASEDIR/demo3.MEP $BASEDIR/demo3_gsm.MEP TOTALEJ.REALIMAG 'RA.*' 'DEC.*' 'StokesI.*'
+$LOFAR_CHECKTOOL ./tPerturbed $USER $BASEDIR/demo3.MS_p1 $BASEDIR/demo3.MEP $BASEDIR/demo3_gsm.MEP TOTALEJ.REALIMAG 'RA.*' 'DEC.*' 'StokesI.*'
 status=$?
 
-./tPerturbed $USER $BASEDIR/demo3.MS_p1 $BASEDIR/demo3.MEP $BASEDIR/demo3_gsm.MEP TOTALEJ 'RA.*' 'DEC.*' 'StokesI.*'
+$LOFAR_CHECKTOOL ./tPerturbed $USER $BASEDIR/demo3.MS_p1 $BASEDIR/demo3.MEP $BASEDIR/demo3_gsm.MEP TOTALEJ 'RA.*' 'DEC.*' 'StokesI.*'
 stat=$?
 if [ $stat != 0 ]; then
   status=$stat
 fi
 
-./tPerturbed $USER $BASEDIR/demo3.MS_p1 $BASEDIR/demo3.MEP $BASEDIR/demo3_gsm.MEP TOTALEJ 'EJ*'
+$LOFAR_CHECKTOOL ./tPerturbed $USER $BASEDIR/demo3.MS_p1 $BASEDIR/demo3.MEP $BASEDIR/demo3_gsm.MEP TOTALEJ 'EJ*'
 stat=$?
 if [ $stat != 0 ]; then
   status=$stat
 fi
 
-./tPerturbed $USER $BASEDIR/demo3.MS_p1 $BASEDIR/demo3.MEP $BASEDIR/demo3p_gsm.MEP TOTALEJ 'RA.*' 'DEC.*' 'StokesI.*'
+$LOFAR_CHECKTOOL ./tPerturbed $USER $BASEDIR/demo3.MS_p1 $BASEDIR/demo3.MEP $BASEDIR/demo3p_gsm.MEP TOTALEJ 'RA.*' 'DEC.*' 'StokesI.*'
 stat=$?
 if [ $stat != 0 ]; then
   status=$stat
diff --git a/CEP/BB/BBS3/test/tPredSolv.run b/CEP/BB/BBS3/test/tPredSolv.run
index 35095b9d9b478c8e011d87757f36363103b6062f..532b9ffdb3c80d9880f4622945cbe9cd29734a8c 100755
--- a/CEP/BB/BBS3/test/tPredSolv.run
+++ b/CEP/BB/BBS3/test/tPredSolv.run
@@ -7,7 +7,7 @@ BASEDIR=/data/PSS3/diepen/BBS2
 cp -r $BASEDIR/demo3.MEP /tmp/$USER.demo.MEP
 cp -r $BASEDIR/demo3_gsm.MEP /tmp/$USER.demo_gsm.MEP
 
-./tPredSolv $USER $BASEDIR/demo3.MS_p1 /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP
+$LOFAR_CHECKTOOL ./tPredSolv $USER $BASEDIR/demo3.MS_p1 /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP
 status=$?
 #\rm -rf /tmp/$USER.demo*
 exit $status
diff --git a/CEP/BB/BBS3/test/tPredict.run b/CEP/BB/BBS3/test/tPredict.run
index ee22cfd89710425ca11c7870b26f59fb3ab97a50..4f10f11e053f39fa3b79701fcff8dff914454d6e 100755
--- a/CEP/BB/BBS3/test/tPredict.run
+++ b/CEP/BB/BBS3/test/tPredict.run
@@ -5,7 +5,7 @@ cp -r /data/PSS3/diepen/BBS2/demo3.MS_p1 /tmp/$USER.demo
 cp -r /data/PSS3/diepen/BBS2/demo3.MEP /tmp/$USER.demo.MEP
 cp -r /data/PSS3/diepen/BBS2/demo3_gsm.MEP_tPredict /tmp/$USER.demo_gsm.MEP
 
-./tPredict $USER /tmp/$USER.demo /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP
+$LOFAR_CHECKTOOL ./tPredict $USER /tmp/$USER.demo /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP
 status=$?
 #\rm -rf /tmp/$USER.demo*
 exit $status
diff --git a/CEP/BB/BBS3/test/tSubtract.run b/CEP/BB/BBS3/test/tSubtract.run
index 2e77b7150fec51e9378f207c0d3cbffe69218620..8518b9ddf26e80b0a7921cad28fd0843e74417e3 100755
--- a/CEP/BB/BBS3/test/tSubtract.run
+++ b/CEP/BB/BBS3/test/tSubtract.run
@@ -5,7 +5,7 @@ cp -r /data/PSS3/diepen/BBS2/demo3.MS_p1 /tmp/$USER.demo
 cp -r /data/PSS3/diepen/BBS2/demo3.MEP /tmp/$USER.demo.MEP
 cp -r /data/PSS3/diepen/BBS2/demo3_gsm.MEP_tPredict /tmp/$USER.demo_gsm.MEP
 
-./tSubtract $USER /tmp/$USER.demo /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP
+$LOFAR_CHECKTOOL ./tSubtract $USER /tmp/$USER.demo /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP
 status=$?
 #\rm -rf /tmp/$USER.demo*
 exit $status
diff --git a/CEP/BB/BDBReplication/test/tBDBReplication.run b/CEP/BB/BDBReplication/test/tBDBReplication.run
index 1544c49f22ba463ecf1e09b23980e06c97f4f246..75c2d6f031758a369824cfc6cc62438b3fc52304 100755
--- a/CEP/BB/BDBReplication/test/tBDBReplication.run
+++ b/CEP/BB/BDBReplication/test/tBDBReplication.run
@@ -5,13 +5,13 @@ MAXRUNTIME=120
 rm masterDir -rf
 mkdir masterDir
 
-./tBDBReplication -h masterDir -o 8020 &> master.log &
+$LOFAR_CHECKTOOL ./tBDBReplication -h masterDir -o 8020 &> master.log &
 MASTERPID=$!
 echo "master has pid $MASTERPID" >&2
 
 rm slave1Dir -rf
 mkdir slave1Dir
-./tBDBReplication -h slave1Dir -m 8020 -o 8021 &> slave1.log &
+$LOFAR_CHECKTOOL ./tBDBReplication -h slave1Dir -m 8020 -o 8021 &> slave1.log &
 SLAVEPID=$!
 echo "slave has pid $SLAVEPID" >&2
 
diff --git a/CEP/BB/MS/test/tMSSplit.run b/CEP/BB/MS/test/tMSSplit.run
index 7d51de0829ee171ae1f49472519bd01e84721699..01d801a1a963cdd6712e87ed335a5b2447695367 100755
--- a/CEP/BB/MS/test/tMSSplit.run
+++ b/CEP/BB/MS/test/tMSSplit.run
@@ -7,4 +7,4 @@ if [ ! -d $1/tMSSplit.MS ]; then
 fi
 # Do the split and check it thereafter.
 ../src/MSSplit $1/tMSSplit.MS tMSSplit_tmp  &&  \
-      tMSSplit $1/tMSSplit.MS tMSSplit_tmp
+      $LOFAR_CHECKTOOL tMSSplit $1/tMSSplit.MS tMSSplit_tmp
diff --git a/CEP/CEPFrame/test/CyclicBufferTest.run b/CEP/CEPFrame/test/CyclicBufferTest.run
index e739236b3ee19f5e9c98d29937b817aed72451e1..77e15184e7b0be896fccd3812113331063f26026 100755
--- a/CEP/CEPFrame/test/CyclicBufferTest.run
+++ b/CEP/CEPFrame/test/CyclicBufferTest.run
@@ -10,6 +10,6 @@ if [ `uname -s | tr '[A-Z]' '[a-z]'` = "linux" ] ;  then
   fi
 fi
 
-./CyclicBufferTest -dGlobal=0
+$LOFAR_CHECKTOOL ./CyclicBufferTest -dGlobal=0
 STATUS=$?
 exit $STATUS
diff --git a/CEP/CEPFrame/test/Example.run b/CEP/CEPFrame/test/Example.run
index 76b575796c0451c3ff4a5f2e8f519be4abf70839..90d5327b6ccac2c7662c0eec4fb193fe7fe39f57 100755
--- a/CEP/CEPFrame/test/Example.run
+++ b/CEP/CEPFrame/test/Example.run
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-./Example -dGlobal=0
+$LOFAR_CHECKTOOL ./Example -dGlobal=0
 STATUS=$?
 if [ $STATUS ]
 then
diff --git a/CEP/CEPFrame/test/Simulator_Example.run b/CEP/CEPFrame/test/Simulator_Example.run
index 8e1c36da06bade58b90be2da3b4223af64551ade..469e3771af7bdc5e9acffee403ea9d7d02a40224 100755
--- a/CEP/CEPFrame/test/Simulator_Example.run
+++ b/CEP/CEPFrame/test/Simulator_Example.run
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-./Simulator_Example -dGlobal=0 < Simulator_Example.in
+$LOFAR_CHECKTOOL ./Simulator_Example -dGlobal=0 < Simulator_Example.in
 STATUS=$?
 exit $STATUS
diff --git a/CEP/CEPFrame/test/TestAutoTrigger.run b/CEP/CEPFrame/test/TestAutoTrigger.run
index 6a21b0d21ace78eb39bf3a744813470290433913..e1471a01ffcb44e252d6f7c7444d262df900c7ec 100755
--- a/CEP/CEPFrame/test/TestAutoTrigger.run
+++ b/CEP/CEPFrame/test/TestAutoTrigger.run
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-./TestAutoTrigger -dGlobal=1
+$LOFAR_CHECKTOOL ./TestAutoTrigger -dGlobal=1
 STATUS=$?
 exit $STATUS
diff --git a/CEP/CEPFrame/test/Tester.run b/CEP/CEPFrame/test/Tester.run
index 0c7eae4f60c9b5043e9cd0fe8abfe5cd5ae14e56..671e6d89169c39a370d4edc2a143af9eb5764887 100755
--- a/CEP/CEPFrame/test/Tester.run
+++ b/CEP/CEPFrame/test/Tester.run
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-./Tester -dGlobal=0
+$LOFAR_CHECKTOOL ./Tester -dGlobal=0
 STATUS=$?
 exit $STATUS
 
diff --git a/CEP/tinyCEP/test/Example3.run b/CEP/tinyCEP/test/Example3.run
index 3c8ff3142a1e1e39b857c936852dc990a6f582ac..ab3265060dc4b0be0776bdbd8ca60bc75a5ac651 100755
--- a/CEP/tinyCEP/test/Example3.run
+++ b/CEP/tinyCEP/test/Example3.run
@@ -3,8 +3,8 @@
 # Run the Example3 test program by starting it twice.
 # Once as sender and once as receiver.
 
-./Example3 -s > Example3_tmp.outs &
-./Example3 -r > Example3_tmp.outr
+$LOFAR_CHECKTOOL ./Example3 -s > Example3_tmp.outs &
+$LOFAR_CHECKTOOL ./Example3 -r > Example3_tmp.outr
 
 # If something went wrong, kill the background process (if it's still running)
 # and exit.
diff --git a/LCS/AMC/AMCImpl/test/tConverter.run b/LCS/AMC/AMCImpl/test/tConverter.run
index 89fcc9cd1cb995df4f1863d07e90ccfe142d162f..f87ba819f54b9a42859f0a51491d04d92240876d 100755
--- a/LCS/AMC/AMCImpl/test/tConverter.run
+++ b/LCS/AMC/AMCImpl/test/tConverter.run
@@ -56,7 +56,7 @@ then
 fi
 
 # Start the test program.
-$EXEC ./tConverter
+$EXEC $LOFAR_CHECKTOOL ./tConverter
 STATUS=$?
 
 # If something went wrong, secure the log file(s)
diff --git a/LCS/AMC/AMCImpl/test/tConverterStress.run b/LCS/AMC/AMCImpl/test/tConverterStress.run
index 9146eae8bfafe39edcbd2c4758a2087d237d72ac..0fbfda97fadc98615cf0d5b792c5846fa5662862 100755
--- a/LCS/AMC/AMCImpl/test/tConverterStress.run
+++ b/LCS/AMC/AMCImpl/test/tConverterStress.run
@@ -58,7 +58,7 @@ then
 fi
 
 # Start the test program.
-$EXEC ./tConverterStress
+$EXEC $LOFAR_CHECKTOOL ./tConverterStress
 STATUS=$?
 
 # If something went wrong, secure the log file(s)
diff --git a/LCS/Transport/test/ExampleEthernet.run b/LCS/Transport/test/ExampleEthernet.run
index 366c899061dc421219df202b7ba6b2788b74a6a8..fa5dc61b098724718b31773e7f04f8a5b56fa1da 100755
--- a/LCS/Transport/test/ExampleEthernet.run
+++ b/LCS/Transport/test/ExampleEthernet.run
@@ -7,9 +7,9 @@ if [ $HOSTNAME != "lofar17" ]; then
   echo "ExampleEthernet test must run on lofar17!"
   exit 1
 else
-  (./ExampleEthernet -r eth0 00:30:48:12:47:D8 >ExampleEthernet_tmp.outr; echo $? >>ExampleEthernet_tmp.result)&
+  ($LOFAR_CHECKTOOL ./ExampleEthernet -r eth0 00:30:48:12:47:D8 >ExampleEthernet_tmp.outr; echo $? >>ExampleEthernet_tmp.result)&
   sleep 1
-  ./ExampleEthernet -s eth0 00:30:48:12:47:D8 >ExampleEthernet_tmp.outs; echo $? >>ExampleEthernet_tmp.result
+  $LOFAR_CHECKTOOL ./ExampleEthernet -s eth0 00:30:48:12:47:D8 >ExampleEthernet_tmp.outs; echo $? >>ExampleEthernet_tmp.result
   
   grep "1" ExampleEthernet_tmp.result
   if [ $? -ne 1 ]; then 
diff --git a/LCS/Transport/test/ExampleSocketPerf.run b/LCS/Transport/test/ExampleSocketPerf.run
index 46f436d7aa6355af8c964ddec5f24bbcaf216f4b..aab60f6c521d5ba4dd5e94af28de423b88261bf0 100755
--- a/LCS/Transport/test/ExampleSocketPerf.run
+++ b/LCS/Transport/test/ExampleSocketPerf.run
@@ -3,7 +3,7 @@
 # Run the ExampleSocketPerf test program by starting it twice.
 # Once as server and once as client.
 
-./ExampleSocketPerf -s -Server > ExampleSocketPerf_tmp.outs1 &
-./ExampleSocketPerf -r -Client > ExampleSocketPerf_tmp.outc1
+$LOFAR_CHECKTOOL ./ExampleSocketPerf -s -Server > ExampleSocketPerf_tmp.outs1 &
+$LOFAR_CHECKTOOL ./ExampleSocketPerf -r -Client > ExampleSocketPerf_tmp.outc1
 sleep 1
 cat ExampleSocketPerf_tmp.outs1 ExampleSocketPerf_tmp.outc1
diff --git a/LCS/Transport/test/tTH_Socket.run b/LCS/Transport/test/tTH_Socket.run
index b1a8c9c093f725a3028bbb77329c3fed2c484ed6..d267959957f1104e015064eca96fc1f0a48bec78 100755
--- a/LCS/Transport/test/tTH_Socket.run
+++ b/LCS/Transport/test/tTH_Socket.run
@@ -3,11 +3,11 @@
 # Run the ExampleSocket test program by starting it twice.
 # Once as server and once as client.
 
-echo "Run1 (takes about 30 seconds) ..."
+echo "Run1 (takes about 30 seconds, longer if checktool is used) ..."
 rm -f tTH_Socket_tmp.result
-(./tTH_Socket -s 1>tTH_Socket_tmp.outs1 2>&1 ; echo $? >>tTH_Socket_tmp.result )&
+($LOFAR_CHECKTOOL ./tTH_Socket -s 1>tTH_Socket_tmp.outs1 2>&1 ; echo $? >>tTH_Socket_tmp.result )&
 echo "CLIENT OUTPUT"
- ./tTH_Socket -c ; echo $? >>tTH_Socket_tmp.result
+ $LOFAR_CHECKTOOL ./tTH_Socket -c ; echo $? >>tTH_Socket_tmp.result
 sleep 1
 echo "SERVER OUTPUT"
 cat tTH_Socket_tmp.outs1
@@ -18,11 +18,11 @@ if [ $? -ne 1 ]; then
 fi
 
 # Do another run with starting the client before the server.
-echo "Run2 (takes about 30 seconds) ..."
+echo "Run2 (takes about 30 seconds, longer if checktool is used) ..."
 rm -f tTH_Socket_tmp.result
-(./tTH_Socket -c 1>tTH_Socket_tmp.outc2 2>&1 ; echo $? >>tTH_Socket_tmp.result )&
+($LOFAR_CHECKTOOL ./tTH_Socket -c 1>tTH_Socket_tmp.outc2 2>&1 ; echo $? >>tTH_Socket_tmp.result )&
 echo "SERVER OUTPUT"
- ./tTH_Socket -s ; echo $? >>tTH_Socket_tmp.result
+ $LOFAR_CHECKTOOL ./tTH_Socket -s ; echo $? >>tTH_Socket_tmp.result
 sleep 1
 echo "CLIENT OUTPUT"
 cat tTH_Socket_tmp.outc2
diff --git a/LCS/databases/TransportPL/test/ExamplePL.run b/LCS/databases/TransportPL/test/ExamplePL.run
index 3e8f09db36590ecd061800615d189b66086fa148..736b510adfe9f7dc99f7ef80ec2f6851866b8c32 100755
--- a/LCS/databases/TransportPL/test/ExamplePL.run
+++ b/LCS/databases/TransportPL/test/ExamplePL.run
@@ -16,7 +16,7 @@ _EOF_
 if [ "$1" != "" ]; then
   exit 0;
 fi
-./ExamplePL
+$LOFAR_CHECKTOOL ./ExamplePL
 STATUS=$?
 if [ $STATUS != 0 ]; then
   exit $STATUS
@@ -28,4 +28,4 @@ psql -h dop50.astron.nl -U postgres test << _EOF_ > ExamplePL_tmp.psql_out 2>&1
 \q
 _EOF_
 
-./ExamplePL 2
+$LOFAR_CHECKTOOL ./ExamplePL 2
diff --git a/LCS/databases/TransportPL/test/ExamplePL2.run b/LCS/databases/TransportPL/test/ExamplePL2.run
index c17562f97d05252143f04a3e9b622427b42e02cd..5928f35194c4dca37eb898f57e0ab1ca6e93f075 100755
--- a/LCS/databases/TransportPL/test/ExamplePL2.run
+++ b/LCS/databases/TransportPL/test/ExamplePL2.run
@@ -14,7 +14,7 @@ _EOF_
 
 # Run the test program if no first argument is given.
 if [ "$1" = "" ]; then
-  ./ExamplePL2
+  $LOFAR_CHECKTOOL ./ExamplePL2
   STATUS=$?
   if [ $STATUS != 0 ]; then
     exit $STATUS
diff --git a/LCS/databases/TransportPL/test/ExamplePL3.run b/LCS/databases/TransportPL/test/ExamplePL3.run
index 0f640804df53166b866f92978681dd131194d272..34d2fe326e50c66d999889f86ba4dc477b8e8b50 100755
--- a/LCS/databases/TransportPL/test/ExamplePL3.run
+++ b/LCS/databases/TransportPL/test/ExamplePL3.run
@@ -14,7 +14,7 @@ _EOF_
 
 # Run the test program if no first argument is given.
 if [ "$1" = "" ]; then
-  ./ExamplePL3
+$LOFAR_CHECKTOOL ./ExamplePL3
   STATUS=$?
   if [ $STATUS != 0 ]; then
     exit $STATUS
diff --git a/LCS/databases/TransportPL/test/ExamplePL4.run b/LCS/databases/TransportPL/test/ExamplePL4.run
index 07751d80b3ce3b2940d4f8125a2fae20c520e15d..c92f31465d4965f7703af102fe8a9c2e659323e1 100755
--- a/LCS/databases/TransportPL/test/ExamplePL4.run
+++ b/LCS/databases/TransportPL/test/ExamplePL4.run
@@ -14,8 +14,7 @@ _EOF_
 
 # Run the test program if no first argument is given.
 if [ "$1" = "" ]; then
-#  ~/bin/valgrind --tool=memcheck --num-callers=50 --workaround-gcc296-bugs=yes --leak-check=yes --track-fds=yes ./ExamplePL4
-  ./ExamplePL4
+  $LOFAR_CHECKTOOL ./ExamplePL4
   STATUS=$?
   if [ $STATUS != 0 ]; then
     exit $STATUS
diff --git a/LCS/databases/TransportPL/test/TestBidirectional.run b/LCS/databases/TransportPL/test/TestBidirectional.run
index abc10ed2cd1ea2ad2f7b0ebd6c317a83b53a0216..4415c29fad4077a8c5a05dfca747d72ebf53de39 100755
--- a/LCS/databases/TransportPL/test/TestBidirectional.run
+++ b/LCS/databases/TransportPL/test/TestBidirectional.run
@@ -16,7 +16,7 @@ _EOF_
 if [ "$1" != "" ]; then
   exit 0;
 fi
-./TestBidirectional
+$LOFAR_CHECKTOOL ./TestBidirectional
 STATUS=$?
 if [ $STATUS != 0 ]; then
   exit $STATUS
diff --git a/LCS/databases/TransportPostgres/test/ExampleDB.run b/LCS/databases/TransportPostgres/test/ExampleDB.run
index 00c285b2d729188b5f4aff158c328f7707239e51..f651eaa9ad6180eeb49e71734701d84987f39a91 100755
--- a/LCS/databases/TransportPostgres/test/ExampleDB.run
+++ b/LCS/databases/TransportPostgres/test/ExampleDB.run
@@ -14,7 +14,7 @@ _EOF_
 
 # Run the test program if no first argument is given.
 if [ "$1" = "" ]; then
-  ./ExampleDB
+  $LOFAR_CHECKTOOL ./ExampleDB
   STATUS=$?
   if [ $STATUS != 0 ]; then
     exit $STATUS
diff --git a/LCS/databases/TransportPostgres/test/ExampleDB2.run b/LCS/databases/TransportPostgres/test/ExampleDB2.run
index b4bddc44d3f6fd55885f430ff8bd397d06b7592f..48f40cd8cfcdc36b0190e61a295c62742bf00fe9 100755
--- a/LCS/databases/TransportPostgres/test/ExampleDB2.run
+++ b/LCS/databases/TransportPostgres/test/ExampleDB2.run
@@ -14,7 +14,7 @@ _EOF_
 
 # Run the test program if no first argument is given.
 if [ "$1" = "" ]; then
-  ./ExampleDB2
+  $LOFAR_CHECKTOOL ./ExampleDB2
   STATUS=$?
   if [ $STATUS != 0 ]; then
     exit $STATUS
diff --git a/Makefile b/Makefile
index 93fde6b7b6dfd6d1ed668182152336b5e6db8711..d71e56ff9145c40916aefc3ee66e0dfa45135205 100644
--- a/Makefile
+++ b/Makefile
@@ -352,7 +352,7 @@ configure: $(VARIANTNAMES:.variant=.variant_configure)
 # Rules for building documentation using doxygen or doc++.
 # Default output directory is docxxhtml.
 ifeq "$(DOCDIR)"  "" 
-   export DOCDIR := /data/LOFAR/installed/docxxhtml
+   export DOCDIR := /data/LOFAR/installed/weekly/docxxhtml
 endif
 
 ifeq "$(DOXYGEN)" ""