diff --git a/Sanity/openCryptoki-PIN-conversion-tool/runtest.sh b/Sanity/openCryptoki-PIN-conversion-tool/runtest.sh
index c3b2698..b709758 100755
--- a/Sanity/openCryptoki-PIN-conversion-tool/runtest.sh
+++ b/Sanity/openCryptoki-PIN-conversion-tool/runtest.sh
@@ -42,6 +42,7 @@ rlJournalStart
         rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
         rlRun "pushd $TmpDir"
         rlFileBackup /etc/opencryptoki/opencryptoki.conf
+	[ -f /etc/opencryptoki/opencryptoki.conf_BAK ] && rlFileBackup /etc/opencryptoki/opencryptoki.conf_BAK && rlRun "rm -f /etc/opencryptoki/opencryptoki.conf_BAK"
         rlServiceStop pkcsslotd
         rlRun "pkcsResetTokens"
         rlServiceStart pkcsslotd
@@ -49,6 +50,8 @@ rlJournalStart
         rlRun "pkcsconf -t"
         SLOT=$( pkcsGetTokenSlot $TOKEN )
 	MODEL=$( pkcsconf -t -c $SLOT | awk '/Model:/ { print $2 }' )
+        rlServiceStop pkcsslotd
+        rlRun "pkcsResetTokens"
         rlRun "sed -i '/tokversion = 3.12/ d' /etc/opencryptoki/opencryptoki.conf" 0 "Remove tokversion = 3.12 from opencryptoki.conf if present"
 	# add token description to reproduce bz#1987256
 	TEXT='description = "My Token"\nmanufacturer = "MyCompany Inc."'