diff --git a/test/addmoddel.sh b/test/addmoddel.sh
index 1b24f881..34577d67 100755
--- a/test/addmoddel.sh
+++ b/test/addmoddel.sh
@@ -12,7 +12,7 @@ fi
 (
 LD_LIBRARY_PATH=../../src:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
-binpath="../../src"
+binpath="$VALGRIND ../../src"
 cp -f ./data/exiv2-empty.jpg ./tmp
 cd ./tmp
 $binpath/addmoddel exiv2-empty.jpg
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index c1207fc6..ac697e64 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -22,7 +22,7 @@ prep_file()
 (
 LD_LIBRARY_PATH=../../src:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
-binpath="../../src"
+binpath="$VALGRIND ../../src"
 cd ./tmp
 
 num=426
diff --git a/test/exifdata-test.sh b/test/exifdata-test.sh
index 601f8922..9cc4c5d3 100755
--- a/test/exifdata-test.sh
+++ b/test/exifdata-test.sh
@@ -12,7 +12,7 @@ fi
 (
 LD_LIBRARY_PATH=../../src:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
-binpath="../../src"
+binpath="$VALGRIND ../../src"
 cp -f ./data/exiv2-gc.jpg ./tmp
 cp -f ./data/exiv2-canon-powershot-s40.jpg ./tmp
 cp -f ./data/exiv2-nikon-d70.jpg ./tmp
diff --git a/test/exiv2-test.sh b/test/exiv2-test.sh
index c29c8145..6e3375da 100755
--- a/test/exiv2-test.sh
+++ b/test/exiv2-test.sh
@@ -2,7 +2,7 @@
 # Test driver for exiv2 utility tests
 LD_LIBRARY_PATH=../../src:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
-exiv2="../../src/exiv2"
+exiv2="$VALGRIND ../../src/exiv2"
 results="./tmp/exiv2-test.out"
 good="./data/exiv2-test.out"
 diffargs="--strip-trailing-cr"
diff --git a/test/ifd-test.sh b/test/ifd-test.sh
index e4cb113f..f25fb679 100755
--- a/test/ifd-test.sh
+++ b/test/ifd-test.sh
@@ -12,7 +12,7 @@ fi
 (
 LD_LIBRARY_PATH=../../src:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
-binpath="../../src"
+binpath=" $VALGRIND ../../src"
 cd ./tmp
 $binpath/ifd-test
 ) > $results 2>&1
diff --git a/test/imagetest.sh b/test/imagetest.sh
index b443b8a4..5bd11cf1 100755
--- a/test/imagetest.sh
+++ b/test/imagetest.sh
@@ -77,7 +77,7 @@ diffCheck()
 
 LD_LIBRARY_PATH=../../src:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
-binpath="../../src"
+binpath="$VALGRIND ../../src"
 datapath="../data"
 
 test_files="table.jpg smiley1.jpg smiley2.jpg"
diff --git a/test/iotest.sh b/test/iotest.sh
index c56c3722..44fdb1ff 100755
--- a/test/iotest.sh
+++ b/test/iotest.sh
@@ -40,7 +40,7 @@ diffCheck()
 
 LD_LIBRARY_PATH=../../src:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
-binpath="../../src"
+binpath="$VALGRIND ../../src"
 datapath="../data"
 
 test_files="table.jpg smiley2.jpg ext.dat"
diff --git a/test/iptctest.sh b/test/iptctest.sh
index 80c2b289..32466d85 100755
--- a/test/iptctest.sh
+++ b/test/iptctest.sh
@@ -112,7 +112,7 @@ diffCheck()
 
 LD_LIBRARY_PATH=../../src:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
-binpath="../../src"
+binpath="$VALGRIND ../../src"
 datapath="../data"
 diffargs="--strip-trailing-cr"
 tmpfile=tmp/ttt
diff --git a/test/makernote-test.sh b/test/makernote-test.sh
index 9f552a5f..c3f476fa 100755
--- a/test/makernote-test.sh
+++ b/test/makernote-test.sh
@@ -12,7 +12,7 @@ fi
 (
 LD_LIBRARY_PATH=../../src:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
-binpath="../../src"
+binpath="$VALGRIND ../../src"
 cd ./tmp
 $binpath/makernote-test
 ) > $results
diff --git a/test/modify-test.sh b/test/modify-test.sh
index 0bc30ba7..8354dd6e 100755
--- a/test/modify-test.sh
+++ b/test/modify-test.sh
@@ -11,7 +11,7 @@ if [ $? -ne 0 ] ; then
 fi
 (
 LD_LIBRARY_PATH=../../src:$LD_LIBRARY_PATH
-binpath="../../src"
+binpath="$VALGRIND ../../src"
 cp -f ./data/exiv2-empty.jpg ./tmp
 cp -f ./data/exiv2-gc.jpg ./tmp
 cd ./tmp
diff --git a/test/path-test.sh b/test/path-test.sh
index a232ce9e..7e671c3d 100755
--- a/test/path-test.sh
+++ b/test/path-test.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Mini test-driver for path utility functions
 LD_LIBRARY_PATH=../../src:$LD_LIBRARY_PATH
-binpath="../../src"
+binpath="$VALGRIND ../../src"
 cd ./tmp
 
 $binpath/path-test ../data/path-test.txt
diff --git a/test/write-test.sh b/test/write-test.sh
index 8ce6d6a8..2356654d 100755
--- a/test/write-test.sh
+++ b/test/write-test.sh
@@ -33,7 +33,7 @@ runTestCase()
 
 LD_LIBRARY_PATH=../../src:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
-binpath="../../src"
+binpath="$VALGRIND ../../src"
 datapath="."
 diffargs="--strip-trailing-cr"
 tmpfile=tmp/ttt
diff --git a/test/write2-test.sh b/test/write2-test.sh
index ed81ef50..8df10db5 100755
--- a/test/write2-test.sh
+++ b/test/write2-test.sh
@@ -12,7 +12,7 @@ fi
 (
 LD_LIBRARY_PATH=../../src:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
-binpath="../../src"
+binpath="$VALGRIND ../../src"
 cp -f ./data/exiv2-empty.jpg ./tmp
 cd ./tmp
 $binpath/write2-test exiv2-empty.jpg