diff --git a/designate_tempest_plugin/clients.py b/designate_tempest_plugin/clients.py
index d412ff5..c6eed6f 100644
--- a/designate_tempest_plugin/clients.py
+++ b/designate_tempest_plugin/clients.py
@@ -25,47 +25,11 @@
     TldClient
 from designate_tempest_plugin.services.dns.v2.json.zones_client import \
     ZonesClient
-# TODO(johnsom) remove once neutron-tempest-plugin test_dns_integration
-#               has been updated
-# https://review.opendev.org/c/openstack/neutron-tempest-plugin/+/800291
-from designate_tempest_plugin.services.dns.query.query_client import \
-    QueryClient
+
 
 CONF = config.CONF
 
 
-# TODO(johnsom) remove once neutron-tempest-plugin test_dns_integration
-#               has been updated
-# https://review.opendev.org/c/openstack/neutron-tempest-plugin/+/800291
-class ManagerV2(clients.Manager):
-
-    def __init__(self, credentials=None):
-        super(ManagerV2, self).__init__(credentials)
-        self._init_clients(self._get_params())
-
-    def _init_clients(self, params):
-        self.zones_client = ZonesClient(**params)
-
-        self.query_client = QueryClient(
-            nameservers=CONF.dns.nameservers,
-            query_timeout=CONF.dns.query_timeout,
-            build_interval=CONF.dns.build_interval,
-            build_timeout=CONF.dns.build_timeout,
-        )
-
-    def _get_params(self):
-        params = dict(self.default_params)
-        params.update({
-            'auth_provider': self.auth_provider,
-            'service': CONF.dns.catalog_type,
-            'region': CONF.identity.region,
-            'endpoint_type': CONF.dns.endpoint_type,
-            'build_interval': CONF.dns.build_interval,
-            'build_timeout': CONF.dns.build_timeout
-        })
-        return params
-
-
 class ManagerV2Unauthed(clients.Manager):
 
     def __init__(self, credentials=None):
diff --git a/designate_tempest_plugin/tests/base.py b/designate_tempest_plugin/tests/base.py
index 2ef5b00..6f2845e 100644
--- a/designate_tempest_plugin/tests/base.py
+++ b/designate_tempest_plugin/tests/base.py
@@ -16,11 +16,6 @@
 from tempest import config
 from tempest.lib.common.utils import test_utils as utils
 
-# TODO(johnsom) remove once neutron-tempest-plugin test_dns_integration
-#               has been updated
-# https://review.opendev.org/c/openstack/neutron-tempest-plugin/+/800291
-from designate_tempest_plugin import clients
-
 from designate_tempest_plugin.services.dns.query.query_client import \
     QueryClient
 
@@ -141,11 +136,6 @@
 class BaseDnsV2Test(BaseDnsTest):
     """Base class for DNS V2 API tests."""
 
-    # TODO(johnsom) remove once neutron-tempest-plugin test_dns_integration
-    #               has been updated
-    # https://review.opendev.org/c/openstack/neutron-tempest-plugin/+/800291
-    client_manager = clients.ManagerV2
-
     @classmethod
     def skip_checks(cls):
         super(BaseDnsV2Test, cls).skip_checks()