diff --git a/cinderclient/tests/v2/test_availability_zone.py b/cinderclient/tests/v2/test_availability_zone.py
index a2e1fc8b3..8dd99aa6c 100644
--- a/cinderclient/tests/v2/test_availability_zone.py
+++ b/cinderclient/tests/v2/test_availability_zone.py
@@ -16,10 +16,10 @@
 
 import six
 
-from cinderclient.v1 import availability_zones
-from cinderclient.v1 import shell
+from cinderclient.v2 import availability_zones
+from cinderclient.v2 import shell
 from cinderclient.tests import utils
-from cinderclient.tests.v1 import fakes
+from cinderclient.tests.v2 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/cinderclient/v2/client.py b/cinderclient/v2/client.py
index 7b91c2344..ebe77489f 100644
--- a/cinderclient/v2/client.py
+++ b/cinderclient/v2/client.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 from cinderclient import client
-from cinderclient.v1 import availability_zones
+from cinderclient.v2 import availability_zones
 from cinderclient.v2 import limits
 from cinderclient.v2 import qos_specs
 from cinderclient.v2 import quota_classes