diff --git a/tempest/config.py b/tempest/config.py
index 0796d98..0a0335d 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -314,7 +314,12 @@
     cfg.BoolOpt('rescue',
                 default=True,
                 help='Does the test environment support instance rescue '
-                     'mode?')
+                     'mode?'),
+    cfg.BoolOpt('enable_instance_password',
+                default=True,
+                help='Enables returning of the instance password by the '
+                     'relevant server API calls such as create, rebuild '
+                     'or rescue.')
 ]