diff --git a/vmware_nsx/tests/unit/nsx_mh/test_opts.py b/vmware_nsx/tests/unit/nsx_mh/test_opts.py
index 184efa9632..2694b80a48 100644
--- a/vmware_nsx/tests/unit/nsx_mh/test_opts.py
+++ b/vmware_nsx/tests/unit/nsx_mh/test_opts.py
@@ -40,7 +40,6 @@ NVP_INI_DEPR_PATH = vmware.get_fake_conf('nvp.ini.full.test')
 class NSXClusterTest(base.BaseTestCase):
 
     cluster_opts = {'default_tz_uuid': uuidutils.generate_uuid(),
-                    'default_l2_gw_service_uuid': uuidutils.generate_uuid(),
                     'default_l2_gw_service_uuid': uuidutils.generate_uuid(),
                     'nsx_user': 'foo',
                     'nsx_password': 'bar',
@@ -92,7 +91,7 @@ class ConfigurationTest(base.BaseTestCase):
         self.assertEqual('whatever', cluster.nsx_default_interface_name)
 
     def _get_mh_plugin(self):
-        with mock.patch("neutron.common.rpc.Connection"):
+        with mock.patch("neutron_lib.rpc.Connection"):
             plugin = mh_plugin.NsxPlugin()
         return plugin
 
@@ -249,7 +248,7 @@ class OldNVPConfigurationTest(base.BaseTestCase):
         self.config_parse(args=['--config-file', BASE_CONF_PATH,
                                 '--config-file', NVP_INI_DEPR_PATH])
         cfg.CONF.set_override('core_plugin', vmware.PLUGIN_NAME)
-        with mock.patch("neutron.common.rpc.Connection"):
+        with mock.patch("neutron_lib.rpc.Connection"):
             plugin = mh_plugin.NsxPlugin()
             cluster = plugin.cluster
             # Verify old nvp_* params have been fully parsed
diff --git a/vmware_nsx/tests/unit/nsx_mh/test_sync.py b/vmware_nsx/tests/unit/nsx_mh/test_sync.py
index c445afeef0..e3eb9ed1ac 100644
--- a/vmware_nsx/tests/unit/nsx_mh/test_sync.py
+++ b/vmware_nsx/tests/unit/nsx_mh/test_sync.py
@@ -295,7 +295,7 @@ class SyncTestCase(testlib_api.SqlTestCase):
         self.config_parse(args=args)
         cfg.CONF.set_override('allow_overlapping_ips', True)
 
-        with mock.patch("neutron.common.rpc.Connection"):
+        with mock.patch("neutron_lib.rpc.Connection"):
             self._plugin = plugin.NsxPlugin()
 
         mock_nm_get_plugin = mock.patch(
diff --git a/vmware_nsx/tests/unit/nsx_v/test_plugin.py b/vmware_nsx/tests/unit/nsx_v/test_plugin.py
index a7e6f97aed..8e92e5ff24 100644
--- a/vmware_nsx/tests/unit/nsx_v/test_plugin.py
+++ b/vmware_nsx/tests/unit/nsx_v/test_plugin.py
@@ -218,6 +218,9 @@ class NsxVPluginV2TestCase(test_plugin.NeutronDbPluginV2TestCase):
         mock_deploy_backup_edges_at_backend = mock.patch("%s.%s" % (
             vmware.EDGE_MANAGE_NAME, '_deploy_backup_edges_at_backend'))
         mock_deploy_backup_edges_at_backend.start()
+        mock.patch(
+            'neutron_lib.rpc.Connection.consume_in_threads',
+            return_value=[]).start()
 
         self.default_res_pool = 'respool-28'
         cfg.CONF.set_override("resource_pool_id", self.default_res_pool,
@@ -1317,16 +1320,16 @@ class TestPortsV2(NsxVPluginV2TestCase,
         res = self.deserialize('json', req.get_response(self.api))
         return res
 
-    @mock.patch.object(edge_utils.EdgeManager, 'delete_dhcp_binding')
     def _test_update_port_index_and_spoofguard(
-        self, ip_version, subnet_cidr, port_ip, port_mac, ipv6_lla,
-        delete_dhcp_binding):
+        self, ip_version, subnet_cidr, port_ip, port_mac, ipv6_lla):
         q_context = context.Context('', 'tenant_1')
         device_id = _uuid()
         with self.subnet(ip_version=ip_version,
                          enable_dhcp=(False if ip_version == 6 else True),
                          cidr=subnet_cidr,
-                         gateway_ip=None) as subnet:
+                         gateway_ip=None) as subnet, \
+            mock.patch.object(edge_utils.EdgeManager,
+                              'delete_dhcp_binding') as delete_dhcp_binding:
             fixed_ip_data = [{'ip_address': port_ip,
                               'subnet_id': subnet['subnet']['id']}]
             with self.port(subnet=subnet,
diff --git a/vmware_nsx/tests/unit/nsx_v3/test_plugin.py b/vmware_nsx/tests/unit/nsx_v3/test_plugin.py
index 5a54682152..58e9c76331 100644
--- a/vmware_nsx/tests/unit/nsx_v3/test_plugin.py
+++ b/vmware_nsx/tests/unit/nsx_v3/test_plugin.py
@@ -211,6 +211,9 @@ class NsxV3PluginTestCaseMixin(test_plugin.NeutronDbPluginV2TestCase,
             nsx_plugin.NsxV3Plugin, '_get_edge_cluster',
             return_value=uuidutils.generate_uuid())
         mock_get_edge_cluster.start()
+        mock.patch(
+            'neutron_lib.rpc.Connection.consume_in_threads',
+            return_value=[]).start()
 
     def setUp(self, plugin=PLUGIN_NAME,
               ext_mgr=None,