diff --git a/neutron_vpnaas/services/vpn/device_drivers/ipsec.py b/neutron_vpnaas/services/vpn/device_drivers/ipsec.py
index d3ca6b251..d597ed4de 100644
--- a/neutron_vpnaas/services/vpn/device_drivers/ipsec.py
+++ b/neutron_vpnaas/services/vpn/device_drivers/ipsec.py
@@ -26,11 +26,11 @@ import jinja2
 import netaddr
 from neutron.agent.linux import ip_lib
 from neutron.agent.linux import utils as agent_utils
-from neutron.common import rpc as n_rpc
 from neutron_lib.api import validators
 from neutron_lib import constants
 from neutron_lib import context
 from neutron_lib.plugins import utils as plugin_utils
+from neutron_lib import rpc as n_rpc
 from neutron_lib.utils import file as file_utils
 from oslo_concurrency import lockutils
 from oslo_config import cfg
diff --git a/neutron_vpnaas/services/vpn/service_drivers/__init__.py b/neutron_vpnaas/services/vpn/service_drivers/__init__.py
index 1f10ad1d7..0a9b39870 100644
--- a/neutron_vpnaas/services/vpn/service_drivers/__init__.py
+++ b/neutron_vpnaas/services/vpn/service_drivers/__init__.py
@@ -15,9 +15,9 @@
 
 import abc
 
-from neutron.common import rpc as n_rpc
 from neutron_lib.plugins import constants
 from neutron_lib.plugins import directory
+from neutron_lib import rpc as n_rpc
 from oslo_log import log as logging
 import oslo_messaging
 import six
diff --git a/neutron_vpnaas/services/vpn/service_drivers/ipsec.py b/neutron_vpnaas/services/vpn/service_drivers/ipsec.py
index 96b420675..4e98cb52c 100644
--- a/neutron_vpnaas/services/vpn/service_drivers/ipsec.py
+++ b/neutron_vpnaas/services/vpn/service_drivers/ipsec.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from neutron.common import rpc as n_rpc
+from neutron_lib import rpc as n_rpc
 
 from neutron_vpnaas.services.vpn.common import topics
 from neutron_vpnaas.services.vpn.service_drivers import base_ipsec
diff --git a/neutron_vpnaas/tests/unit/dummy_ipsec.py b/neutron_vpnaas/tests/unit/dummy_ipsec.py
index ce05544f5..d9cb9e3d8 100644
--- a/neutron_vpnaas/tests/unit/dummy_ipsec.py
+++ b/neutron_vpnaas/tests/unit/dummy_ipsec.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from neutron.common import rpc as n_rpc
+from neutron_lib import rpc as n_rpc
 
 from neutron_vpnaas.services.vpn.service_drivers import base_ipsec
 from neutron_vpnaas.services.vpn.service_drivers import ipsec_validator