diff --git a/Library/token-manipulation/lib.sh b/Library/token-manipulation/lib.sh
index ff3cc86..f6b37ec 100644
--- a/Library/token-manipulation/lib.sh
+++ b/Library/token-manipulation/lib.sh
@@ -256,7 +256,9 @@ Returns 0 if the backup and removal passed, non-zero otherwise.
 
 
 pkcsResetTokens() {
-    rlFileBackup --clean --namespace pkcslib /var/lib/opencryptoki && \
+    local NAMESPACE=pkcslib
+    [ -n "$1" ] && NAMESPACE="$1"
+    rlFileBackup --clean --namespace ${NAMESPACE} /var/lib/opencryptoki && \
     find /var/lib/opencryptoki/ -type f -exec rm {} \; && \
     rm -f /dev/shm/var.lib.opencryptoki.*
 }
diff --git a/Sanity/testsuite/runtest.sh b/Sanity/testsuite/runtest.sh
index b2e909a..0e5fa02 100755
--- a/Sanity/testsuite/runtest.sh
+++ b/Sanity/testsuite/runtest.sh
@@ -44,7 +44,7 @@ LOGDIR=`mktemp -d`
 function reset_tokens() {
     rlLogInfo "Reseting tokens..."
     rlServiceStop pkcsslotd
-    rlRun "pkcsResetTokens"
+    rlRun "pkcsResetTokens randomNamespace"  # using different namespace not to overwrite previous backup
     rlServiceStart pkcsslotd
     rlLogInfo "Initializing tokens..."
     rlRun "pkcsInitToken $SLOT"
@@ -75,6 +75,10 @@ rlJournalStart
         tail build.log
         TESTDIR=`ls -d ~/rpmbuild/BUILD/opencryptoki*/testcases`
 
+        rlServiceStop pkcsslotd
+        sleep 3
+        rlRun "pkcsResetTokens"
+
         rlServiceStart pkcsslotd
         rlLogInfo "Available tokens"
         pkcsconf -t