Enable valgrind tests in meson.

25 files changed, 538 insertions, 73 deletions

diff --git a/tests/align-test b/tests/align-test
index 94aab06f..d2932ae4 100755
--- a/tests/align-test
+++ b/tests/align-test
@@ -12,8 +12,13 @@ FAST_PBKDF="--pbkdf-force-iterations 1000"
 
 FIPS_MODE=$(cat /proc/sys/crypto/fips_enabled 2>/dev/null)
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
+
 
 function fips_mode()
 {
@@ -54,7 +59,10 @@ function valgrind_setup()
 {
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()
diff --git a/tests/align-test2 b/tests/align-test2
index d705d140..23d418a8 100755
--- a/tests/align-test2
+++ b/tests/align-test2
@@ -11,8 +11,12 @@ PWD1="93R4P4pIqAH8"
 PWD2="mymJeD8ivEhE"
 FAST_PBKDF="--pbkdf pbkdf2 --pbkdf-force-iterations 1000"
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
 
 cleanup() {
 	udevadm settle >/dev/null 2>&1
@@ -49,7 +53,10 @@ function valgrind_setup()
 {
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()
diff --git a/tests/bitlk-compat-test b/tests/bitlk-compat-test
index a698afde..aa4a71fc 100755
--- a/tests/bitlk-compat-test
+++ b/tests/bitlk-compat-test
@@ -8,8 +8,12 @@ TST_DIR=bitlk-images
 MAP=bitlktst
 DUMP_VK_FILE=bitlk-test-vk
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
 
 [ -z "$srcdir" ] && srcdir="."
 
@@ -93,7 +97,10 @@ function valgrind_setup()
 {
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()
diff --git a/tests/compat-args-test b/tests/compat-args-test
index c41e9421..788cc7c7 100755
--- a/tests/compat-args-test
+++ b/tests/compat-args-test
@@ -4,8 +4,12 @@ PS4='$LINENO:'
 [ -z "$CRYPTSETUP_PATH" ] && CRYPTSETUP_PATH=".."
 CRYPTSETUP=$CRYPTSETUP_PATH/cryptsetup
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
 
 TEST_UUID="12345678-1234-1234-1234-123456789abc"
 
@@ -37,7 +41,10 @@ function valgrind_setup()
 {
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()
diff --git a/tests/compat-test b/tests/compat-test
index bf86625c..433beb2a 100755
--- a/tests/compat-test
+++ b/tests/compat-test
@@ -5,8 +5,12 @@ PS4='$LINENO:'
 CRYPTSETUP=$CRYPTSETUP_PATH/cryptsetup
 CRYPTSETUP_RAW=$CRYPTSETUP
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
 
 DIFFER=./differ
 DEV_NAME=dummy
@@ -199,7 +203,10 @@ function valgrind_setup()
 	[ -n "$VALG" ] || return
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 	CRYPTSETUP=valgrind_run
 	CRYPTSETUP_RAW="./valg.sh ${CRYPTSETUP_VALGRIND}"
 }
diff --git a/tests/compat-test-opal b/tests/compat-test-opal
index bc46a843..ad8e2355 100755
--- a/tests/compat-test-opal
+++ b/tests/compat-test-opal
@@ -4,8 +4,12 @@ PS4='$LINENO:'
 [ -z "$CRYPTSETUP_PATH" ] && CRYPTSETUP_PATH=".."
 CRYPTSETUP=$CRYPTSETUP_PATH/cryptsetup
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
 
 DEV_NAME=dummy
 DEV_NAME2=dummy2
@@ -143,7 +147,10 @@ function valgrind_setup()
 {
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()
diff --git a/tests/compat-test2 b/tests/compat-test2
index 2c026f47..aca2aeaf 100755
--- a/tests/compat-test2
+++ b/tests/compat-test2
@@ -5,8 +5,12 @@ PS4='$LINENO:'
 CRYPTSETUP=$CRYPTSETUP_PATH/cryptsetup
 CRYPTSETUP_RAW=$CRYPTSETUP
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
 
 DEV_NAME=dummy
 DEV_NAME2=dummy2
@@ -158,7 +162,10 @@ function valgrind_setup()
 {
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()
diff --git a/tests/device-test b/tests/device-test
index 5137a9b8..d35e226e 100755
--- a/tests/device-test
+++ b/tests/device-test
@@ -11,8 +11,12 @@ FAST_PBKDF_OPT="--pbkdf pbkdf2 --pbkdf-force-iterations 1000"
 PLAIN_OPT="--type plain --cipher aes-cbc-essiv:sha256 --key-size 256 --hash sha256"
 SKIP_COUNT=0
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
 
 cleanup() {
 	[ -b /dev/mapper/$DEV_NAME ] && dmsetup remove --retry $DEV_NAME
@@ -44,7 +48,10 @@ function valgrind_setup()
 {
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()
diff --git a/tests/discards-test b/tests/discards-test
index 46924fcf..27e5a5b8 100755
--- a/tests/discards-test
+++ b/tests/discards-test
@@ -6,8 +6,12 @@ DEV_NAME="discard-t3st"
 DEV=""
 PWD1="93R4P4pIqAH8"
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
 
 cleanup() {
 	[ -b /dev/mapper/$DEV_NAME ] && dmsetup remove --retry $DEV_NAME
@@ -34,7 +38,10 @@ function valgrind_setup()
 {
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()
diff --git a/tests/fvault2-compat-test b/tests/fvault2-compat-test
index 45022d21..047798a8 100755
--- a/tests/fvault2-compat-test
+++ b/tests/fvault2-compat-test
@@ -5,8 +5,12 @@ CRYPTSETUP=$CRYPTSETUP_PATH/cryptsetup
 MAP=fvault2test
 TST_DIR=fvault2-images
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
 
 [ -z "$srcdir" ] && srcdir="."
 
@@ -83,7 +87,10 @@ function valgrind_setup()
 {
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()
diff --git a/tests/integrity-compat-test b/tests/integrity-compat-test
index 208eafb7..a2aae8de 100755
--- a/tests/integrity-compat-test
+++ b/tests/integrity-compat-test
@@ -5,8 +5,12 @@
 [ -z "$CRYPTSETUP_PATH" ] && CRYPTSETUP_PATH=".."
 INTSETUP=$CRYPTSETUP_PATH/integritysetup
 
-INTSETUP_VALGRIND=../.libs/integritysetup
-INTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	INTSETUP_VALGRIND=$INTSETUP
+else
+	INTSETUP_VALGRIND=../.libs/integritysetup
+	INTSETUP_LIB_VALGRIND=../.libs
+fi
 
 DEV_NAME=dmc_test
 DEV_NAME2=dmc_fake
@@ -115,7 +119,10 @@ function valgrind_setup()
 {
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $INTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$INTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$INTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()
diff --git a/tests/keyring-compat-test b/tests/keyring-compat-test
index efb8fdc3..dc4787d6 100755
--- a/tests/keyring-compat-test
+++ b/tests/keyring-compat-test
@@ -26,8 +26,12 @@ PWD="aaablabl"
 [ -z "$CRYPTSETUP_PATH" ] && CRYPTSETUP_PATH=".."
 CRYPTSETUP=$CRYPTSETUP_PATH/cryptsetup
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
 
 FIPS_MODE=$(cat /proc/sys/crypto/fips_enabled 2>/dev/null)
 
@@ -54,7 +58,10 @@ function valgrind_setup()
 {
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()
diff --git a/tests/loopaes-test b/tests/loopaes-test
index fdb4cd39..62fe7723 100755
--- a/tests/loopaes-test
+++ b/tests/loopaes-test
@@ -3,8 +3,12 @@
 [ -z "$CRYPTSETUP_PATH" ] && CRYPTSETUP_PATH=".."
 CRYPTSETUP=$CRYPTSETUP_PATH/cryptsetup
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
 
 # try to validate using loop-AES losetup/kernel if available
 LOSETUP_AES=/losetup-aes.old
@@ -49,7 +53,10 @@ function valgrind_setup()
 {
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()
diff --git a/tests/luks1-compat-test b/tests/luks1-compat-test
index 18afcd52..c0de983e 100755
--- a/tests/luks1-compat-test
+++ b/tests/luks1-compat-test
@@ -6,8 +6,12 @@ TST_DIR=luks1-images
 MAP=luks1tst
 KEYFILE=keyfile1
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
 
 [ -z "$srcdir" ] && srcdir="."
 
@@ -38,7 +42,10 @@ function valgrind_setup()
 {
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()
diff --git a/tests/luks2-integrity-test b/tests/luks2-integrity-test
index 0fe91ec1..ff41ebf6 100755
--- a/tests/luks2-integrity-test
+++ b/tests/luks2-integrity-test
@@ -11,8 +11,12 @@ PWD1=nHjJHjI23JK
 KEY_FILE=key.img
 FAST_PBKDF_OPT="--pbkdf pbkdf2 --pbkdf-force-iterations 1000"
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
 
 dmremove() { # device
 	udevadm settle >/dev/null 2>&1
@@ -45,7 +49,10 @@ function valgrind_setup()
 {
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()
diff --git a/tests/luks2-reencryption-mangle-test b/tests/luks2-reencryption-mangle-test
index 5aa62e41..79b813df 100755
--- a/tests/luks2-reencryption-mangle-test
+++ b/tests/luks2-reencryption-mangle-test
@@ -5,8 +5,12 @@ PS4='$LINENO:'
 CRYPTSETUP=$CRYPTSETUP_PATH/cryptsetup
 CRYPTSETUP_RAW=$CRYPTSETUP
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
 IMG=reenc-mangle-data
 IMG_HDR=$IMG.hdr
 IMG_HDR_BCP=$IMG_HDR.bcp
@@ -210,7 +214,10 @@ function valgrind_setup()
 {
 	bin_check valgrind
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 	CRYPTSETUP=valgrind_run
 	CRYPTSETUP_RAW="./valg.sh ${CRYPTSETUP_VALGRIND}"
 }
diff --git a/tests/luks2-reencryption-test b/tests/luks2-reencryption-test
index a647a8c2..65320447 100755
--- a/tests/luks2-reencryption-test
+++ b/tests/luks2-reencryption-test
@@ -4,8 +4,12 @@
 [ -z "$CRYPTSETUP_PATH" ] && CRYPTSETUP_PATH=".."
 CRYPTSETUP=$CRYPTSETUP_PATH/cryptsetup
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
 
 FAST_PBKDF2="--pbkdf pbkdf2 --pbkdf-force-iterations 1000"
 FAST_PBKDF_ARGON="--pbkdf-force-iterations 4 --pbkdf-memory 32 --pbkdf-parallel 1"
@@ -819,7 +823,10 @@ function valgrind_setup()
 {
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()
diff --git a/tests/luks2-validation-test b/tests/luks2-validation-test
index cd9f0a6f..545c38ec 100755
--- a/tests/luks2-validation-test
+++ b/tests/luks2-validation-test
@@ -6,8 +6,12 @@ PS4='$LINENO:'
 [ -z "$CRYPTSETUP_PATH" ] && CRYPTSETUP_PATH=".."
 CRYPTSETUP=$CRYPTSETUP_PATH/cryptsetup
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
 
 START_DIR=$(pwd)
 
@@ -106,7 +110,10 @@ function valgrind_setup()
 {
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()
diff --git a/tests/meson.build b/tests/meson.build
index e4cb5327..c6de3c48 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,5 +1,10 @@
 fs = import('fs')
 
+add_test_setup('default',
+    is_default: true,
+    exclude_suites: [ 'valgrind' ]
+)
+
 # copy images and generators to build directory from where tests run
 test_files_to_copy = [
     'bitlk-images.tar.xz',
@@ -25,6 +30,8 @@ test_files_to_copy = [
     'tcrypt-images.tar.xz',
     'valid_header_file.xz',
     'xfs_512_block_size.img.xz',
+    'valg.sh',
+    'cryptsetup-valg-supps',
 ]
 
 foreach file : test_files_to_copy
@@ -152,6 +159,21 @@ tests_env.set('LIBCRYPTSETUP_DIR', lib_build_dir)
 tests_env.set('srcdir', meson.current_source_dir())
 tests_env.set('CRYPTSETUP_TESTS_RUN_IN_MESON', '1')
 
+tests_env_valg = tests_env
+tests_env_valg.set('VALG', '1')
+
+tests_env_valg_api_00 = tests_env
+tests_env_valg_api_00.set('INFOSTRING','api-test-000')
+
+tests_env_valg_api_02 = tests_env
+tests_env_valg_api_02.set('INFOSTRING','api-test-002')
+
+tests_env_valg_unit_crypt = tests_env
+tests_env_valg_unit_crypt.set('INFOSTRING','unit-utils-crypt-test')
+
+tests_env_valg_vector = tests_env
+tests_env_valg_vector.set('INFOSTRING','vector-test')
+
 test('00modules-test',
     find_program('./00modules-test'),
     workdir: meson.current_build_dir(),
@@ -165,12 +187,30 @@ test('api-test',
     env: tests_env,
     timeout: 14400,
     is_parallel: false)
+test('valg-api-test',
+    find_program('./valg-api.sh'),
+    args: [ './api-test'],
+    depends: [ api_test ],
+    workdir: meson.current_build_dir(),
+    env: tests_env_valg_api_00,
+    timeout: 14400,
+    is_parallel: false,
+    suite: 'valgrind')
 test('api-test-2',
     api_test_2,
     workdir: meson.current_build_dir(),
     env: tests_env,
     timeout: 14400,
     is_parallel: false)
+test('valg-api-test-2',
+    find_program('./valg-api.sh'),
+    args: [ './api-test-2'],
+    depends: [ api_test_2 ],
+    workdir: meson.current_build_dir(),
+    env: tests_env_valg_api_02,
+    timeout: 14400,
+    is_parallel: false,
+    suite: 'valgrind')
 test('blockwise-compat-test',
     find_program('./blockwise-compat-test'),
     workdir: meson.current_build_dir(),
@@ -206,6 +246,15 @@ test('unit-utils-crypt-test',
     env: tests_env,
     timeout: 14400,
     is_parallel: false)
+test('valg-unit-utils-crypt-test',
+    find_program('./valg-api.sh'),
+    args: [ './unit-utils-crypt-test' ],
+    depends: [ unit_utils_crypt_test ],
+    workdir: meson.current_build_dir(),
+    env: tests_env_valg_unit_crypt,
+    timeout: 14400,
+    is_parallel: false,
+    suite: 'valgrind')
 
 if not enable_static
     test('run-all-symbols',
@@ -231,6 +280,17 @@ if get_option('cryptsetup')
             cryptsetup,
             test_symbols_list_h,
         ])
+    test('valg-compat-args-test',
+        find_program('./compat-args-test'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup,
+            test_symbols_list_h,
+        ])
     test('compat-test',
         find_program('./compat-test'),
         workdir: meson.current_build_dir(),
@@ -241,6 +301,17 @@ if get_option('cryptsetup')
             cryptsetup,
             differ,
         ])
+    test('valg-compat-test',
+        find_program('./compat-test'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup,
+            differ,
+        ])
     test('compat-test2',
         find_program('./compat-test2'),
         workdir: meson.current_build_dir(),
@@ -250,6 +321,16 @@ if get_option('cryptsetup')
         depends: [
             cryptsetup,
         ])
+    test('valg-compat-test2',
+        find_program('./compat-test2'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup,
+        ])
     test('compat-test-opal',
         find_program('./compat-test-opal'),
         workdir: meson.current_build_dir(),
@@ -260,6 +341,16 @@ if get_option('cryptsetup')
             cryptsetup,
             differ,
         ])
+    test('valg-compat-test-opal',
+        find_program('./compat-test-opal'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup,
+        ])
     test('loopaes-test',
         find_program('./loopaes-test'),
         workdir: meson.current_build_dir(),
@@ -269,6 +360,16 @@ if get_option('cryptsetup')
         depends: [
             cryptsetup,
         ])
+    test('valg-loopaes-test',
+        find_program('./loopaes-test'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup,
+        ])
     test('align-test',
         find_program('./align-test'),
         workdir: meson.current_build_dir(),
@@ -278,6 +379,16 @@ if get_option('cryptsetup')
         depends: [
             cryptsetup,
         ])
+    test('valg-align-test',
+        find_program('./align-test'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup,
+        ])
     test('align-test2',
         find_program('./align-test2'),
         workdir: meson.current_build_dir(),
@@ -287,6 +398,16 @@ if get_option('cryptsetup')
         depends: [
             cryptsetup,
         ])
+    test('valg-align-test2',
+        find_program('./align-test2'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup,
+        ])
     test('discards-test',
         find_program('./discards-test'),
         workdir: meson.current_build_dir(),
@@ -296,6 +417,16 @@ if get_option('cryptsetup')
         depends: [
             cryptsetup,
         ])
+    test('valg-discards-test',
+        find_program('./discards-test'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup,
+        ])
     test('mode-test',
         find_program('./mode-test'),
         workdir: meson.current_build_dir(),
@@ -305,6 +436,16 @@ if get_option('cryptsetup')
         depends: [
             cryptsetup,
         ])
+    test('valg-mode-test',
+        find_program('./mode-test'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup,
+        ])
     test('password-hash-test',
         find_program('./password-hash-test'),
         workdir: meson.current_build_dir(),
@@ -314,6 +455,16 @@ if get_option('cryptsetup')
         depends: [
             cryptsetup,
         ])
+    test('valg-password-hash-test',
+        find_program('./password-hash-test'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup,
+        ])
     test('tcrypt-compat-test',
         find_program('./tcrypt-compat-test'),
         workdir: meson.current_build_dir(),
@@ -323,6 +474,16 @@ if get_option('cryptsetup')
         depends: [
             cryptsetup,
         ])
+    test('valg-tcrypt-compat-test',
+        find_program('./tcrypt-compat-test'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup,
+        ])
     test('luks1-compat-test',
         find_program('./luks1-compat-test'),
         workdir: meson.current_build_dir(),
@@ -332,6 +493,16 @@ if get_option('cryptsetup')
         depends: [
             cryptsetup,
         ])
+    test('valg-luks1-compat-test',
+        find_program('./luks1-compat-test'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup,
+        ])
     test('device-test',
         find_program('./device-test'),
         workdir: meson.current_build_dir(),
@@ -341,6 +512,16 @@ if get_option('cryptsetup')
         depends: [
             cryptsetup,
         ])
+    test('valg-device-test',
+        find_program('./device-test'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup,
+        ])
     test('keyring-compat-test',
         find_program('./keyring-compat-test'),
         workdir: meson.current_build_dir(),
@@ -350,6 +531,16 @@ if get_option('cryptsetup')
         depends: [
             cryptsetup,
         ])
+    test('valg-keyring-compat-test',
+        find_program('./keyring-compat-test'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup,
+        ])
     test('luks2-validation-test',
         find_program('./luks2-validation-test'),
         workdir: meson.current_build_dir(),
@@ -359,6 +550,16 @@ if get_option('cryptsetup')
         depends: [
             cryptsetup,
         ])
+    test('valg-luks2-validation-test',
+        find_program('./luks2-validation-test'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup,
+        ])
     test('luks2-integrity-test',
         find_program('./luks2-integrity-test'),
         workdir: meson.current_build_dir(),
@@ -368,6 +569,16 @@ if get_option('cryptsetup')
         depends: [
             cryptsetup,
         ])
+    test('valg-luks2-integrity-test',
+        find_program('./luks2-integrity-test'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup,
+        ])
     test('bitlk-compat-test',
         find_program('./bitlk-compat-test'),
         workdir: meson.current_build_dir(),
@@ -377,6 +588,16 @@ if get_option('cryptsetup')
         depends: [
             cryptsetup,
         ])
+    test('valg-bitlk-compat-test',
+        find_program('./bitlk-compat-test'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup,
+        ])
     test('fvault2-compat-test',
         find_program('./fvault2-compat-test'),
         workdir: meson.current_build_dir(),
@@ -386,6 +607,16 @@ if get_option('cryptsetup')
         depends: [
             cryptsetup,
         ])
+    test('valg-fvault2-compat-test',
+        find_program('./fvault2-compat-test'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup,
+        ])
     test('reencryption-compat-test',
         find_program('./reencryption-compat-test'),
         workdir: meson.current_build_dir(),
@@ -395,6 +626,16 @@ if get_option('cryptsetup')
         depends: [
             cryptsetup,
         ])
+    test('valg-reencryption-compat-test',
+        find_program('./reencryption-compat-test'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup,
+        ])
     test('luks2-reencryption-test',
         find_program('./luks2-reencryption-test'),
         workdir: meson.current_build_dir(),
@@ -404,6 +645,16 @@ if get_option('cryptsetup')
         depends: [
             cryptsetup,
         ])
+    test('valg-luks2-reencryption-test',
+        find_program('./luks2-reencryption-test'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup,
+        ])
     test('luks2-reencryption-mangle-test',
         find_program('./luks2-reencryption-mangle-test'),
         workdir: meson.current_build_dir(),
@@ -413,6 +664,16 @@ if get_option('cryptsetup')
         depends: [
             cryptsetup,
         ])
+    test('valg-luks2-reencryption-mangle-test',
+        find_program('./luks2-reencryption-mangle-test'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup,
+        ])
 endif
 
 if get_option('veritysetup')
@@ -425,6 +686,16 @@ if get_option('veritysetup')
         depends: [
             veritysetup,
         ])
+    test('valg-verity-compat-test',
+        find_program('verity-compat-test'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            veritysetup,
+        ])
 endif
 
 if get_option('integritysetup')
@@ -437,6 +708,16 @@ if get_option('integritysetup')
         depends: [
             integritysetup,
         ])
+    test('valg-integrity-compat-test',
+        find_program('integrity-compat-test'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            integritysetup,
+        ])
 endif
 
 if get_option('ssh-token') and not enable_static
@@ -451,6 +732,18 @@ if get_option('ssh-token') and not enable_static
             fake_token_path,
             libcryptsetup_token_ssh,
         ])
+    test('valg-ssh-test-plugin',
+        find_program('ssh-test-plugin'),
+        workdir: meson.current_build_dir(),
+        env: tests_env_valg,
+        timeout: 14400,
+        is_parallel: false,
+        suite: 'valgrind',
+        depends: [
+            cryptsetup_ssh,
+            fake_token_path,
+            libcryptsetup_token_ssh,
+        ])
 endif
 
 if get_option('external-tokens') and not enable_static
diff --git a/tests/mode-test b/tests/mode-test
index 7f7f20a1..81780cd6 100755
--- a/tests/mode-test
+++ b/tests/mode-test
@@ -18,8 +18,12 @@ IVMODES="null benbi plain plain64 essiv:sha256"
 
 LOOPDEV=$(losetup -f 2>/dev/null)
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
 
 dmremove() { # device
 	udevadm settle >/dev/null 2>&1
@@ -52,7 +56,10 @@ function valgrind_setup()
 {
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()
diff --git a/tests/password-hash-test b/tests/password-hash-test
index 6e3c78cb..e7773906 100755
--- a/tests/password-hash-test
+++ b/tests/password-hash-test
@@ -9,8 +9,12 @@ KEY_FILE=keyfile
 
 DEV2=$DEV_NAME"_x"
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
 
 dmremove() { # device
 	udevadm settle >/dev/null 2>&1
@@ -42,7 +46,10 @@ function valgrind_setup()
 {
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()
diff --git a/tests/reencryption-compat-test b/tests/reencryption-compat-test
index 8fdcca84..68a8c1f2 100755
--- a/tests/reencryption-compat-test
+++ b/tests/reencryption-compat-test
@@ -6,8 +6,12 @@ REENC_BIN=$CRYPTSETUP
 REENC="$REENC_BIN reencrypt"
 FAST_PBKDF="--pbkdf-force-iterations 1000 --pbkdf pbkdf2"
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
 
 DEV_NAME=reenc9768
 DEV_NAME2=reenc1273
@@ -68,7 +72,10 @@ function valgrind_setup()
 {
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()
diff --git a/tests/ssh-test-plugin b/tests/ssh-test-plugin
index 01590ed5..97908bc3 100755
--- a/tests/ssh-test-plugin
+++ b/tests/ssh-test-plugin
@@ -21,9 +21,16 @@ SSH_KEY_PATH="$HOME/sshtest-key"
 
 FAST_PBKDF_OPT="--pbkdf pbkdf2 --pbkdf-force-iterations 1000"
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_SSH_VALGRIND=../.libs/cryptsetup-ssh
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP=$CRYPTSETUP_PATH/cryptsetup
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+	CRYPTSETUP_SSH=$CRYPTSETUP_PATH/../tokens/ssh/cryptsetup-ssh
+	CRYPTSETUP_SSH_VALGRIND=$CRYPTSETUP_SSH
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_SSH_VALGRIND=../.libs/cryptsetup-ssh
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
 
 [ -z "$srcdir" ] && srcdir="."
 
@@ -113,7 +120,9 @@ function valgrind_setup()
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
 	[ ! -f $CRYPTSETUP_SSH_VALGRIND ] && fail "Unable to get location of cryptsetup-ssh executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()
diff --git a/tests/tcrypt-compat-test b/tests/tcrypt-compat-test
index 5e316e98..0708b32e 100755
--- a/tests/tcrypt-compat-test
+++ b/tests/tcrypt-compat-test
@@ -11,8 +11,12 @@ PASSWORD_HIDDEN="bbbbbbbbbbbb"
 PASSWORD_72C="aaaaaaaaaaaabbbbbbbbbbbbccccccccccccddddddddddddeeeeeeeeeeeeffffffffffff"
 PIM=1234
 
-CRYPTSETUP_VALGRIND=../.libs/cryptsetup
-CRYPTSETUP_LIB_VALGRIND=../.libs
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	CRYPTSETUP_VALGRIND=$CRYPTSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/cryptsetup
+	CRYPTSETUP_LIB_VALGRIND=../.libs
+fi
 
 [ -z "$srcdir" ] && srcdir="."
 
@@ -115,7 +119,10 @@ function valgrind_setup()
 {
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $CRYPTSETUP_VALGRIND ] && fail "Unable to get location of cryptsetup executable."
-	export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$CRYPTSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()
diff --git a/tests/verity-compat-test b/tests/verity-compat-test
index ceac3fbf..ed14dfb5 100755
--- a/tests/verity-compat-test
+++ b/tests/verity-compat-test
@@ -2,8 +2,13 @@
 
 [ -z "$CRYPTSETUP_PATH" ] && CRYPTSETUP_PATH=".."
 VERITYSETUP=$CRYPTSETUP_PATH/veritysetup
-VERITYSETUP_VALGRIND=../.libs/veritysetup
-VERITYSETUP_LIB_VALGRIND=../.libs
+
+if [ -n "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+	VERITYSETUP_VALGRIND=$VERITYSETUP
+else
+	CRYPTSETUP_VALGRIND=../.libs/veritysetup
+	VERITYSETUP_LIB_VALGRIND=../.libs
+fi
 
 DEV_NAME=verity3273
 DEV_NAME2=verity3273x
@@ -304,7 +309,10 @@ function valgrind_setup()
 {
 	command -v valgrind >/dev/null || fail "Cannot find valgrind."
 	[ ! -f $VERITYSETUP_VALGRIND ] && fail "Unable to get location of veritysetup executable."
-	export LD_LIBRARY_PATH="$VERITYSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	[ ! -f valg.sh ] && fail "Unable to get location of valg runner script."
+	if [ -z "$CRYPTSETUP_TESTS_RUN_IN_MESON" ]; then
+		export LD_LIBRARY_PATH="$VERITYSETUP_LIB_VALGRIND:$LD_LIBRARY_PATH"
+	fi
 }
 
 function valgrind_run()