diff --git a/tests/Sanity/basic-sanity/runtest.sh b/tests/Sanity/basic-sanity/runtest.sh
index f067ab3..f662f76 100755
--- a/tests/Sanity/basic-sanity/runtest.sh
+++ b/tests/Sanity/basic-sanity/runtest.sh
@@ -67,8 +67,6 @@ _CERT_PASS="certpass"
 _NEW_LUKS_PASS="newlukspass"
 _NEW_LUKS_PASS_ASYM="newlukspass-asym"
 
-_LANG_BACKUP="${LANG:-}"
-_LC_ALL_BACKUP="${LC_ALL:-}"
 _TEMP_DIR=""
 _VOLUME=""
 
@@ -90,7 +88,7 @@ function Setup() {
   fi
 
   rlRun CreateTemporaryDirectory || return $?
-  _TEMP_DIR="${_Result}"
+  _TEMP_DIR="${Result}"
   AtCleanup Cleanup_RemoveTemporaryDirectory
 
   PushDir "${_TEMP_DIR}" || return $?
@@ -101,7 +99,7 @@ function Setup() {
     --password "${_LUKS_PASS}" \
     ${USE_LOSETUP:+--with-losetup} \
   || return $?
-  _VOLUME="${_Result}"
+  _VOLUME="${Result}"
   AtCleanup Cleanup_DestroyVolume
 
   CreateCertificate --name "${_ESCROW}" || return $?
diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index e0d3bc7..480b7e4 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -96,7 +96,7 @@ function CreateEncryptedVolume() {
       luksFormat "${__volume}" \
   || return $?
 
-  Result="${_volume}"
+  Result="${__volume}"
 }
 
 ##
diff --git a/tests/utils/volume_key.exp b/tests/utils/volume_key.exp
index 26fa29e..06abe1a 100755
--- a/tests/utils/volume_key.exp
+++ b/tests/utils/volume_key.exp
@@ -50,6 +50,7 @@ if {[catch {
 
 set password1 $params(password1)
 set password2 $params(password2)
+set pinentry $params(pinentry)
 
 proc prompt_volume_password {password} {
   verify_password $password