diff --git a/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/run-failed-restore.expect b/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/run-failed-restore.expect
index a7224f7..d31b354 100644
--- a/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/run-failed-restore.expect
+++ b/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/run-failed-restore.expect
@@ -8,8 +8,12 @@ spawn dsmc restore /opt/backup-test/ /opt/restore-target/ -asnodename=$nodename
 expect "Action \\\[1,2,3,A\\\] : " {
   send -- "1\r"
   expect -exact "Enter encryption key password: "
+  # Some times the password shows up in the output,
+  # we suspect this is a race condition with turning of echo for the tty, so sleep
+  sleep 1
   send -- "$enc_password\r"
   expect -exact "Confirm encryption key password: "
+  sleep 1
   send -- "$enc_password\r"
 }
 expect "ANS8013I Invalid encryption key password" {
diff --git a/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/run-successful-restore.expect b/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/run-successful-restore.expect
index b1f3a63..423fc9e 100644
--- a/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/run-successful-restore.expect
+++ b/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/run-successful-restore.expect
@@ -6,11 +6,14 @@ set exit_val 1
 
 spawn dsmc restore /opt/backup-test/ /opt/restore-target/ -asnodename=$nodename -subdir=yes
 expect "Action \\\[1,2,3,A\\\] : " {
-  send -- "1\r"
-  expect -exact "Enter encryption key password: " {
+    send -- "1\r"
+    expect -exact "Enter encryption key password: "
+    # Sometimes the password shows up in the output,
+    # we suspect this is a race condition with turning of echo for the tty, so sleep
+    sleep 1
     send -- "$enc_password\r"
-  }
-  expect -exact "Confirm encryption key password: " {
+    expect -exact "Confirm encryption key password: "
+    sleep 1
     send -- "$enc_password\r"
   }
   expect "Restore processing finished." {