diff --git a/tests/test-pkcs11-tool-sign-verify.sh b/tests/test-pkcs11-tool-sign-verify.sh
index 299d2f4a..8aff6877 100755
--- a/tests/test-pkcs11-tool-sign-verify.sh
+++ b/tests/test-pkcs11-tool-sign-verify.sh
@@ -49,6 +49,9 @@ for HASH in "" "SHA1" "SHA224" "SHA256" "SHA384" "SHA512"; do
             continue; # This one is broken
         fi
 
+        # Ubuntu SoftHSM version does not support RSA-PSS
+        grep "Ubuntu 18.04" /etc/issue && echo "WARNING: Not supported on Ubuntu 18.04" && continue
+
         echo
         echo "======================================================="
         echo "$METHOD: Sign & Verify (KEY $SIGN_KEY)"
diff --git a/tests/test-pkcs11-tool-test.sh b/tests/test-pkcs11-tool-test.sh
index 512fdb00..d96e8668 100755
--- a/tests/test-pkcs11-tool-test.sh
+++ b/tests/test-pkcs11-tool-test.sh
@@ -9,6 +9,10 @@ if [[ ! -f $P11LIB ]]; then
     echo "WARNINIG: The SoftHSM is not installed. Can not run this test"
     exit 77;
 fi
+
+# The Ubuntu has old softhsm version not supporting this feature
+grep "Ubuntu 18.04" /etc/issue && echo "WARNING: Not supported on Ubuntu 18.04" && exit 77
+
 card_setup
 
 echo "======================================================="