diff --git a/tests/meson.build b/tests/meson.build
index 52280dbc..73c388c2 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -140,7 +140,7 @@ tests = {
   'hkdf': {'suites': ['softokn', 'kryoptic', 'kryoptic.nss']},
   'imported' : {'suites': ['softokn', 'kryoptic', 'kryoptic.nss']},
   'rsapss': {'suites': ['softokn', 'softhsm', 'kryoptic', 'kryoptic.nss']},
-  'rsapssam': {'suites': ['softhsm']},
+  'rsapssam': {'suites': ['softhsm', 'kryoptic']},
   'genkey': {'suites': ['softokn', 'softhsm', 'kryoptic', 'kryoptic.nss']},
   'session': {'suites': ['softokn', 'softhsm', 'kryoptic', 'kryoptic.nss']},
   'rand': {'suites': ['softokn', 'softhsm', 'kryoptic', 'kryoptic.nss']},
diff --git a/tests/trsapssam b/tests/trsapssam
index 242914a8..fc73a255 100755
--- a/tests/trsapssam
+++ b/tests/trsapssam
@@ -52,7 +52,7 @@ if [ $FAIL -eq 0 ]; then
 fi
 output="$helper_output"
 FAIL=0
-echo "$output" | grep "mechanism not allowed with this key" > /dev/null 2>&1 || FAIL=1
+echo "$output" | grep "Public Key operation error" > /dev/null 2>&1 || FAIL=1
 if [ $FAIL -ne 0 ]; then
     echo "Signature seem to have failed for unrelated reasons"
     echo "$output";