diff --git a/keystoneclient/tests/v2_0/test_shell.py b/keystoneclient/tests/v2_0/test_shell.py
index 0fafb7167..57bbe9d01 100644
--- a/keystoneclient/tests/v2_0/test_shell.py
+++ b/keystoneclient/tests/v2_0/test_shell.py
@@ -104,6 +104,8 @@ class ShellTests(utils.TestCase):
         self.stub_url('POST', ['users'], json={'user': {}})
 
         with mock.patch('getpass.getpass') as mock_getpass:
+            del(os.environ['OS_PASSWORD'])
+            mock_stdin.isatty = lambda: True
             mock_getpass.return_value = 'newpass'
             self.run_command('user-create --name new-user --pass')