diff --git a/vmware_nsx/plugins/nsx_v/plugin.py b/vmware_nsx/plugins/nsx_v/plugin.py
index 5e9a196242..4da078e848 100644
--- a/vmware_nsx/plugins/nsx_v/plugin.py
+++ b/vmware_nsx/plugins/nsx_v/plugin.py
@@ -35,6 +35,7 @@ from neutron_lib import exceptions as n_exc
 from neutron_lib.exceptions import port_security as psec_exc
 from neutron_lib.plugins import constants as plugin_const
 from neutron_lib.plugins import directory
+from neutron_lib.services.qos import constants as qos_consts
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
@@ -84,7 +85,6 @@ from neutron.objects import securitygroup
 from neutron.plugins.common import utils
 from neutron.quota import resource_registry
 from neutron.services.flavors import flavors_plugin
-from neutron.services.qos import qos_consts
 from vmware_nsx.dvs import dvs
 from vmware_nsx.services.qos.common import utils as qos_com_utils
 from vmware_nsx.services.qos.nsx_v import driver as qos_driver
diff --git a/vmware_nsx/plugins/nsx_v3/plugin.py b/vmware_nsx/plugins/nsx_v3/plugin.py
index ddea2ae5b8..931d68ce8d 100644
--- a/vmware_nsx/plugins/nsx_v3/plugin.py
+++ b/vmware_nsx/plugins/nsx_v3/plugin.py
@@ -17,6 +17,7 @@ import netaddr
 from neutron_lib.api.definitions import network as net_def
 from neutron_lib.api.definitions import port_security as psec
 from neutron_lib.exceptions import port_security as psec_exc
+from neutron_lib.services.qos import constants as qos_consts
 
 from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api
 from neutron.api.rpc.handlers import dhcp_rpc
@@ -52,7 +53,6 @@ from neutron.extensions import providernet
 from neutron.extensions import securitygroup as ext_sg
 from neutron.plugins.common import utils as n_utils
 from neutron.quota import resource_registry
-from neutron.services.qos import qos_consts
 from neutron_lib.api.definitions import extra_dhcp_opt as ext_edo
 from neutron_lib.api.definitions import portbindings as pbin
 from neutron_lib.api.definitions import provider_net as pnet
diff --git a/vmware_nsx/services/qos/common/utils.py b/vmware_nsx/services/qos/common/utils.py
index 7814035b06..75eec368a7 100644
--- a/vmware_nsx/services/qos/common/utils.py
+++ b/vmware_nsx/services/qos/common/utils.py
@@ -15,7 +15,7 @@
 #    under the License.
 
 from neutron.objects.qos import policy as qos_policy
-from neutron.services.qos import qos_consts
+from neutron_lib.services.qos import constants as qos_consts
 
 
 def update_network_policy_binding(context, net_id, new_policy_id):
diff --git a/vmware_nsx/services/qos/nsx_v/driver.py b/vmware_nsx/services/qos/nsx_v/driver.py
index 67a9709b3e..7597c31293 100644
--- a/vmware_nsx/services/qos/nsx_v/driver.py
+++ b/vmware_nsx/services/qos/nsx_v/driver.py
@@ -15,10 +15,10 @@
 #    under the License.
 
 from neutron_lib.services.qos import base
+from neutron_lib.services.qos import constants as qos_consts
 from oslo_log import log as logging
 
 from neutron.common import constants as n_consts
-from neutron.services.qos import qos_consts
 
 LOG = logging.getLogger(__name__)
 DRIVER = None
diff --git a/vmware_nsx/services/qos/nsx_v/utils.py b/vmware_nsx/services/qos/nsx_v/utils.py
index 62fbcfa56d..8544710f37 100644
--- a/vmware_nsx/services/qos/nsx_v/utils.py
+++ b/vmware_nsx/services/qos/nsx_v/utils.py
@@ -15,9 +15,9 @@
 #    under the License.
 
 from neutron.common import constants as n_consts
-from neutron.services.qos import qos_consts
 from neutron_lib.plugins import constants as plugin_const
 from neutron_lib.plugins import directory
+from neutron_lib.services.qos import constants as qos_consts
 
 from oslo_config import cfg
 from oslo_log import log as logging
diff --git a/vmware_nsx/services/qos/nsx_v3/driver.py b/vmware_nsx/services/qos/nsx_v3/driver.py
index 2e724e54b3..1d6726121c 100644
--- a/vmware_nsx/services/qos/nsx_v3/driver.py
+++ b/vmware_nsx/services/qos/nsx_v3/driver.py
@@ -15,10 +15,10 @@
 #    under the License.
 
 from neutron_lib.services.qos import base
+from neutron_lib.services.qos import constants as qos_consts
 from oslo_log import log as logging
 
 from neutron.common import constants as n_consts
-from neutron.services.qos import qos_consts
 
 from vmware_nsx.services.qos.nsx_v3 import utils as qos_utils
 
diff --git a/vmware_nsx/services/qos/nsx_v3/utils.py b/vmware_nsx/services/qos/nsx_v3/utils.py
index 980525330b..6e3739856a 100644
--- a/vmware_nsx/services/qos/nsx_v3/utils.py
+++ b/vmware_nsx/services/qos/nsx_v3/utils.py
@@ -18,10 +18,10 @@ from oslo_config import cfg
 from oslo_log import log as logging
 
 from neutron.common import constants as n_consts
-from neutron.services.qos import qos_consts
 from neutron_lib.api import validators
 from neutron_lib import exceptions as n_exc
 from neutron_lib.plugins import directory
+from neutron_lib.services.qos import constants as qos_consts
 
 from vmware_nsx._i18n import _
 from vmware_nsx.common import exceptions as nsx_exc
diff --git a/vmware_nsx/tests/unit/nsx_v/test_plugin.py b/vmware_nsx/tests/unit/nsx_v/test_plugin.py
index 5a9c5eca2a..f41ea222e2 100644
--- a/vmware_nsx/tests/unit/nsx_v/test_plugin.py
+++ b/vmware_nsx/tests/unit/nsx_v/test_plugin.py
@@ -30,7 +30,6 @@ from neutron.extensions import l3_flavors
 from neutron.extensions import router_availability_zone
 from neutron.extensions import securitygroup as secgrp
 from neutron.plugins.common import utils
-from neutron.services.qos import qos_consts
 from neutron.tests.unit import _test_extension_portbindings as test_bindings
 import neutron.tests.unit.db.test_allowedaddresspairs_db as test_addr_pair
 import neutron.tests.unit.db.test_db_base_plugin_v2 as test_plugin
@@ -51,6 +50,7 @@ from neutron_lib import context
 from neutron_lib import exceptions as n_exc
 from neutron_lib.plugins import constants as plugin_const
 from neutron_lib.plugins import directory
+from neutron_lib.services.qos import constants as qos_consts
 from neutron_lib.utils import helpers
 from neutron_lib.utils import net
 from oslo_config import cfg
diff --git a/vmware_nsx/tests/unit/services/qos/test_nsxv_notification.py b/vmware_nsx/tests/unit/services/qos/test_nsxv_notification.py
index 6d9f47568a..3912afdcd3 100644
--- a/vmware_nsx/tests/unit/services/qos/test_nsxv_notification.py
+++ b/vmware_nsx/tests/unit/services/qos/test_nsxv_notification.py
@@ -17,11 +17,11 @@ import copy
 import mock
 from neutron.objects.qos import policy as policy_object
 from neutron.objects.qos import rule as rule_object
-from neutron.services.qos import qos_consts
 from neutron.services.qos import qos_plugin
 from neutron.tests.unit.services.qos import base
 from neutron_lib import context
 from neutron_lib.plugins import directory
+from neutron_lib.services.qos import constants as qos_consts
 from oslo_config import cfg
 from oslo_utils import uuidutils