diff --git a/src/partition/repart.c b/src/partition/repart.c
index 7a24e8ffec8..cbda6e408bd 100644
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -3788,7 +3788,7 @@ static int context_verity_sig(Context *context) {
                 _cleanup_free_ char *text = NULL;
                 Partition *hp;
                 uint8_t fp[X509_FINGERPRINT_SIZE];
-                size_t sigsz, padsz;
+                size_t sigsz = 0, padsz; /* avoid false maybe-uninitialized warning */
 
                 if (p->dropped)
                         continue;
diff --git a/test/units/testsuite-70.sh b/test/units/testsuite-70.sh
index 97536c812cc..b1cf7e83c4b 100755
--- a/test/units/testsuite-70.sh
+++ b/test/units/testsuite-70.sh
@@ -33,7 +33,8 @@ env PIN=123456 /usr/lib/systemd/systemd-cryptsetup attach test-volume $img - tpm
 env PIN=123457 /usr/lib/systemd/systemd-cryptsetup attach test-volume $img - tpm2-device=auto,headless=1 && { echo 'unexpected success'; exit 1; }
 
 # Check LUKS2 token plugin unlock (i.e. without specifying tpm2-device=auto)
-if cryptsetup --help | grep -q 'LUKS2 external token plugin support is compiled-in'; then
+if cryptsetup --help | grep -q 'LUKS2 external token plugin support is compiled-in' && \
+         [ -f "$(cryptsetup --help | sed -n -r 's/.*LUKS2 external token plugin path: (.*)\./\1/p')/libcryptsetup-token-systemd-tpm2.so" ]; then
     env PIN=123456 /usr/lib/systemd/systemd-cryptsetup attach test-volume $img - headless=1
     /usr/lib/systemd/systemd-cryptsetup detach test-volume