diff --git a/Regression/bz415971-pkcsconf-validation-of-PIN-is-wrong/runtest.sh b/Regression/bz415971-pkcsconf-validation-of-PIN-is-wrong/runtest.sh
index e26f26f..086e463 100755
--- a/Regression/bz415971-pkcsconf-validation-of-PIN-is-wrong/runtest.sh
+++ b/Regression/bz415971-pkcsconf-validation-of-PIN-is-wrong/runtest.sh
@@ -53,7 +53,7 @@ rlJournalStart
 
     rlPhaseStartTest
         rlRun "./pkcsconf.exp $PKCSCONF 2>&1 | tee $TMP"    
-        rlAssertGrep "New PINs do not match." $TMP    
+        rlAssertGrep "Invalid new user pin|New PINs do not match." $TMP -E
     rlPhaseEnd
 
     rlPhaseStartCleanup
diff --git a/Sanity/p11sak-key-management-tool-basic-functionality/main.fmf b/Sanity/p11sak-key-management-tool-basic-functionality/main.fmf
index f343e72..9105e0d 100644
--- a/Sanity/p11sak-key-management-tool-basic-functionality/main.fmf
+++ b/Sanity/p11sak-key-management-tool-basic-functionality/main.fmf
@@ -4,31 +4,32 @@ description: |
     Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1800549
 contact: Karel Srot <ksrot@redhat.com>
 component:
-- openCryptoki
+  - openCryptoki
 test: ./runtest.sh
 framework: beakerlib
 require:
-- library(nvr/nvr)
-- url: https://src.fedoraproject.org/tests/opencryptoki.git
-  name: /Library/token-manipulation
+  - library(nvr/nvr)
+  - url: https://src.fedoraproject.org/tests/opencryptoki.git
+    name: /Library/token-manipulation
 recommend:
-- opencryptoki
-- opencryptoki-swtok
-- expect
+  - opencryptoki
+  - opencryptoki-swtok
+  - expect
 duration: 5m
 enabled: true
 tag:
-- CI-Tier-1
-- Tier1
-- customer_scenario
+  - CI-Tier-1
+  - Tier1
+  - customer_scenario
 tier: '1'
 link:
--   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1800549
--   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1851109
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1800549
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1851109
 adjust:
--   enabled: false
+  - enabled: false
     when: distro == rhel-4, rhel-5, rhel-6, rhel-7
     continue: false
 extra-nitrate: TC#0607944
 extra-summary: /CoreOS/opencryptoki/Sanity/bz1800549-p11sak-key-management-tool-basic-functionality
 extra-task: /CoreOS/opencryptoki/Sanity/bz1800549-p11sak-key-management-tool-basic-functionality
+id: 065dda66-85f0-4142-83d3-b4104d359d41