diff --git a/tests/Sanity/sanity-test/runtest.sh b/tests/Sanity/sanity-test/runtest.sh
index 4ec24a3..106f432 100755
--- a/tests/Sanity/sanity-test/runtest.sh
+++ b/tests/Sanity/sanity-test/runtest.sh
@@ -81,7 +81,13 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStartCleanup
-        [[ "${del}" == "yes" ]] && rlRun "userdel -r ${BUILD_USER}"
+        if [[ "${del}" == "yes" ]]; then
+            rlRun "pkill --signal SIGTERM -u ${BUILD_USER}" 0-255
+            sleep 3
+            rlRun "pkill --signal SIGKILL -u ${BUILD_USER}" 0-255
+            sleep 1
+            rlRun "userdel -rf ${BUILD_USER}" 0-255
+        fi
         rlRun "popd"
         rlRun "rm -r ${TmpDir}" 0 "Removing tmp directory"
     rlPhaseEnd