diff --git a/functional/tests/common/test_configuration.py b/functional/tests/common/test_configuration.py
index 94a624d2eb..f4a0209973 100644
--- a/functional/tests/common/test_configuration.py
+++ b/functional/tests/common/test_configuration.py
@@ -13,19 +13,26 @@
 import os
 
 from functional.common import test
+from openstackclient.common import configuration
+
 
 BASIC_CONFIG_HEADERS = ['Field', 'Value']
 
 
 class ConfigurationTests(test.TestCase):
 
+    opts = "-f value -c auth.password"
+
     def test_configuration_show(self):
         raw_output = self.openstack('configuration show')
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, BASIC_CONFIG_HEADERS)
 
     def test_configuration_show_unmask(self):
-        opts = "-f value -c auth.password"
-        raw_output = self.openstack('configuration show --unmask ' + opts)
+        raw_output = self.openstack('configuration show --unmask ' + self.opts)
         passwd = os.environ['OS_PASSWORD']
         self.assertOutput(passwd + '\n', raw_output)
+
+    def test_configuration_show_mask(self):
+        raw_output = self.openstack('configuration show --mask ' + self.opts)
+        self.assertOutput(configuration.REDACTED + '\n', raw_output)