diff --git a/flocker/node/agents/cinder.py b/flocker/node/agents/cinder.py
index 3670768b51..811e4d13b6 100644
--- a/flocker/node/agents/cinder.py
+++ b/flocker/node/agents/cinder.py
@@ -530,7 +530,7 @@ def list_volumes(self):
         http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/GET_getVolumesDetail_v1__tenant_id__volumes_detail_volumes.html
         """
         flocker_volumes = []
-        for cinder_volume in self.cinder_volume_manager.list(detailed=False):
+        for cinder_volume in self.cinder_volume_manager.list(detailed=True):
             if _is_cluster_volume(self.cluster_id, cinder_volume):
                 flocker_volume = _blockdevicevolume_from_cinder_volume(
                     cinder_volume
diff --git a/flocker/node/agents/functional/test_cinder.py b/flocker/node/agents/functional/test_cinder.py
index d785f4e298..8e12f378d8 100644
--- a/flocker/node/agents/functional/test_cinder.py
+++ b/flocker/node/agents/functional/test_cinder.py
@@ -868,6 +868,7 @@ def _build_and_test_api(self, listening_port):
         (api
          .cinder_volume_manager
          ._original
+         ._client_v2
          ._cinder_volumes
          .api
          .client
diff --git a/requirements/flocker-dev.txt b/requirements/flocker-dev.txt
index f17ef1f144..e423ffdf2b 100644
--- a/requirements/flocker-dev.txt
+++ b/requirements/flocker-dev.txt
@@ -1,4 +1,5 @@
-mimic==2.1.0
+--find-links git+https://github.com/ClusterHQ/mimic@2.1.0+chq2#egg=mimic-2.1.0+chq2
+mimic==2.1.0+chq2
 # The test suite uses network namespaces
 # nomenclature can only be installed on Linux
 # The "linux2" marker value is specific to Python2
diff --git a/requirements/flocker-dev.txt.in b/requirements/flocker-dev.txt.in
index 4de5698160..ffb1647f92 100644
--- a/requirements/flocker-dev.txt.in
+++ b/requirements/flocker-dev.txt.in
@@ -1,3 +1,4 @@
+--find-links git+https://github.com/ClusterHQ/mimic@2.1.0+chq2#egg=mimic-2.1.0+chq2
 mimic
 # The test suite uses network namespaces
 # nomenclature can only be installed on Linux