diff --git a/os_brick/initiator/connectors/rbd.py b/os_brick/initiator/connectors/rbd.py
index 0f34728f3..9257a260c 100644
--- a/os_brick/initiator/connectors/rbd.py
+++ b/os_brick/initiator/connectors/rbd.py
@@ -217,6 +217,7 @@ class RBDConnector(base.BaseLinuxConnector):
         """
         __, volume = connection_properties['name'].split('/')
         cmd = ['rbd', 'showmapped', '--format=json']
+        cmd += self._get_rbd_args(connection_properties)
         (out, err) = self._execute(*cmd, root_helper=self._root_helper,
                                    run_as_root=True)
         for index, mapping in jsonutils.loads(out).items():
diff --git a/os_brick/tests/initiator/connectors/test_rbd.py b/os_brick/tests/initiator/connectors/test_rbd.py
index f8ba41666..0fd284c23 100644
--- a/os_brick/tests/initiator/connectors/test_rbd.py
+++ b/os_brick/tests/initiator/connectors/test_rbd.py
@@ -258,8 +258,8 @@ class RBDConnectorTestCase(test_connector.ConnectorTestCase):
                 'hosts': ['192.168.10.2'],
                 'ports': ['6789']}
         mock_execute.side_effect = [("""
-{"0":{"pool":"pool","device":"/dev/rbd0","name":"pool-image"},
- "1":{"pool":"pool","device":"/dev/rdb1","name":"pool-image_2"}}""", None),
+{"0":{"pool":"pool","device":"/dev/rbd0","name":"image"},
+ "1":{"pool":"pool","device":"/dev/rdb1","name":"image_2"}}""", None),
                                     (None, None)]
         show_cmd = ['rbd', 'showmapped', '--format=json', '--id', 'fake_user',
                     '--mon_host', '192.168.10.2:6789']
@@ -269,7 +269,7 @@ class RBDConnectorTestCase(test_connector.ConnectorTestCase):
         rbd_connector.disconnect_volume(conn, None)
 
         # Assert that showmapped is used before we unmap the root device
-        mock_execute.has_calls([
+        mock_execute.assert_has_calls([
             mock.call(*show_cmd, root_helper=None, run_as_root=True),
             mock.call(*unmap_cmd, root_helper=None, run_as_root=True)])