diff --git a/openstackclient/tests/volume/v2/fakes.py b/openstackclient/tests/volume/v2/fakes.py
index 3571890a41..d3ca009eea 100644
--- a/openstackclient/tests/volume/v2/fakes.py
+++ b/openstackclient/tests/volume/v2/fakes.py
@@ -23,194 +23,6 @@ from openstackclient.tests.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.image.v2 import fakes as image_fakes
 from openstackclient.tests import utils
 
-volume_attachment_server = {
-    'device': '/dev/ice',
-    'server_id': '1233',
-}
-
-volume_id = "ce26708d-a7f8-4b4b-9861-4a80256615a6"
-volume_name = "fake_volume"
-volume_description = "fake description"
-volume_status = "available"
-volume_size = 20
-volume_type = "fake_lvmdriver-1"
-volume_metadata = {
-    'Alpha': 'a',
-    'Beta': 'b',
-    'Gamma': 'g',
-}
-volume_metadata_str = "Alpha='a', Beta='b', Gamma='g'"
-volume_snapshot_id = 1
-volume_availability_zone = "nova"
-volume_attachments = [volume_attachment_server]
-
-VOLUME = {
-    "id": volume_id,
-    "name": volume_name,
-    "description": volume_description,
-    "status": volume_status,
-    "size": volume_size,
-    "volume_type": volume_type,
-    "metadata": volume_metadata,
-    "snapshot_id": volume_snapshot_id,
-    "availability_zone": volume_availability_zone,
-    "attachments": volume_attachments
-}
-
-VOLUME_columns = (
-    "attachments",
-    "availability_zone",
-    "description",
-    "id",
-    "name",
-    "properties",
-    "size",
-    "snapshot_id",
-    "status",
-    "type"
-)
-
-VOLUME_data = (
-    volume_attachments,
-    volume_availability_zone,
-    volume_description,
-    volume_id,
-    volume_name,
-    common_utils.format_dict(volume_metadata),
-    volume_size,
-    volume_snapshot_id,
-    volume_status,
-    volume_type
-)
-
-
-snapshot_id = "cb2d364e-4d1c-451a-8c68-b5bbcb340fb2"
-snapshot_name = "fake_snapshot"
-snapshot_description = "fake description"
-snapshot_size = 10
-snapshot_metadata = {
-    "foo": "bar"
-}
-snapshot_volume_id = "bdbae8dc-e6ca-43c0-8076-951cc1b093a4"
-
-SNAPSHOT = {
-    "id": snapshot_id,
-    "name": snapshot_name,
-    "description": snapshot_description,
-    "size": snapshot_size,
-    "status": "available",
-    "metadata": snapshot_metadata,
-    "created_at": "2015-06-03T18:49:19.000000",
-    "volume_id": volume_name
-}
-EXPECTED_SNAPSHOT = copy.deepcopy(SNAPSHOT)
-EXPECTED_SNAPSHOT.pop("metadata")
-EXPECTED_SNAPSHOT['properties'] = "foo='bar'"
-SNAPSHOT_columns = tuple(sorted(EXPECTED_SNAPSHOT))
-SNAPSHOT_data = tuple((EXPECTED_SNAPSHOT[x]
-                       for x in sorted(EXPECTED_SNAPSHOT)))
-
-
-type_id = "5520dc9e-6f9b-4378-a719-729911c0f407"
-type_description = "fake description"
-type_name = "fake-lvmdriver-1"
-type_extra_specs = {
-    "foo": "bar"
-}
-
-TYPE = {
-    'id': type_id,
-    'name': type_name,
-    'description': type_description,
-    'extra_specs': type_extra_specs
-}
-
-TYPE_columns = tuple(sorted(TYPE))
-TYPE_data = tuple((TYPE[x] for x in sorted(TYPE)))
-
-formatted_type_properties = "foo='bar'"
-TYPE_FORMATTED = {
-    'id': type_id,
-    'name': type_name,
-    'description': type_description,
-    'properties': formatted_type_properties
-}
-TYPE_FORMATTED_columns = tuple(sorted(TYPE_FORMATTED))
-TYPE_FORMATTED_data = tuple((TYPE_FORMATTED[x] for x in
-                             sorted(TYPE_FORMATTED)))
-
-backup_id = "3c409fe6-4d03-4a06-aeab-18bdcdf3c8f4"
-backup_volume_id = "bdbae8dc-e6ca-43c0-8076-951cc1b093a4"
-backup_name = "fake_backup"
-backup_description = "fake description"
-backup_object_count = None
-backup_container = None
-backup_size = 10
-backup_status = "error"
-
-BACKUP = {
-    "id": backup_id,
-    "name": backup_name,
-    "volume_id": backup_volume_id,
-    "description": backup_description,
-    "object_count": backup_object_count,
-    "container": backup_container,
-    "size": backup_size,
-    "status": backup_status,
-    "availability_zone": volume_availability_zone,
-}
-
-BACKUP_columns = tuple(sorted(BACKUP))
-BACKUP_data = tuple((BACKUP[x] for x in sorted(BACKUP)))
-
-qos_id = '6f2be1de-997b-4230-b76c-a3633b59e8fb'
-qos_consumer = 'front-end'
-qos_default_consumer = 'both'
-qos_name = "fake-qos-specs"
-qos_specs = {
-    'foo': 'bar',
-    'iops': '9001'
-}
-qos_association = {
-    'association_type': 'volume_type',
-    'name': type_name,
-    'id': type_id
-}
-
-QOS = {
-    'id': qos_id,
-    'consumer': qos_consumer,
-    'name': qos_name
-}
-
-QOS_DEFAULT_CONSUMER = {
-    'id': qos_id,
-    'consumer': qos_default_consumer,
-    'name': qos_name
-}
-
-QOS_WITH_SPECS = {
-    'id': qos_id,
-    'consumer': qos_consumer,
-    'name': qos_name,
-    'specs': qos_specs
-}
-
-QOS_WITH_ASSOCIATIONS = {
-    'id': qos_id,
-    'consumer': qos_consumer,
-    'name': qos_name,
-    'specs': qos_specs,
-    'associations': [qos_association]
-}
-
-image_id = 'im1'
-image_name = 'graven'
-IMAGE = {
-    'id': image_id,
-    'name': image_name
-}
-
 
 class FakeTransferClient(object):