diff --git a/manila/compute/nova.py b/manila/compute/nova.py
index 6ed9ebd9..fb70b5c5 100644
--- a/manila/compute/nova.py
+++ b/manila/compute/nova.py
@@ -21,9 +21,9 @@ import sys
 from novaclient import exceptions as nova_exception
 from novaclient import service_catalog
 from novaclient import utils
-from novaclient.v1_1 import client as nova_client
-from novaclient.v1_1.contrib import assisted_volume_snapshots
-from novaclient.v1_1 import servers as nova_servers
+from novaclient.v2 import client as nova_client
+from novaclient.v2.contrib import assisted_volume_snapshots
+from novaclient.v2 import servers as nova_servers
 from oslo_config import cfg
 from oslo_log import log
 
diff --git a/manila/tests/compute/test_nova.py b/manila/tests/compute/test_nova.py
index 28a5e96c..a54046de 100644
--- a/manila/tests/compute/test_nova.py
+++ b/manila/tests/compute/test_nova.py
@@ -15,7 +15,7 @@
 import mock
 from novaclient import exceptions as nova_exception
 from novaclient import utils
-from novaclient.v1_1 import servers as nova_servers
+from novaclient.v2 import servers as nova_servers
 
 from manila.compute import nova
 from manila import context