diff --git a/doc/requirements.txt b/doc/requirements.txt
index d7f98a2eaa..1a8dfb8e9a 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -2,6 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 # Docs
+hacking>=3.0 # Apache-2.0
 os-api-ref>=1.4.0 # Apache-2.0
 sphinxcontrib-actdiag>=0.8.5 # BSD
 sphinxcontrib-apidoc>=0.2.1 # BSD
diff --git a/octavia/amphorae/backends/utils/network_namespace.py b/octavia/amphorae/backends/utils/network_namespace.py
index c8e282543e..f03080e8ad 100644
--- a/octavia/amphorae/backends/utils/network_namespace.py
+++ b/octavia/amphorae/backends/utils/network_namespace.py
@@ -40,7 +40,6 @@ class NetworkNamespace(object):
 
     def __enter__(self):
         # Save the current network namespace
-        # pylint: disable=consider-using-with
         self.current_netns_fd = open(self.current_netns, encoding='utf-8')
         with open(self.target_netns, encoding='utf-8') as fd:
             self.set_netns(fd.fileno(), self.CLONE_NEWNET)
diff --git a/octavia/amphorae/drivers/health/heartbeat_udp.py b/octavia/amphorae/drivers/health/heartbeat_udp.py
index c744431c71..0930b2f0f6 100644
--- a/octavia/amphorae/drivers/health/heartbeat_udp.py
+++ b/octavia/amphorae/drivers/health/heartbeat_udp.py
@@ -53,10 +53,8 @@ class UDPStatusGetter(object):
         self.sock = None
         self.update(self.key, self.ip, self.port)
 
-        # pylint: disable=consider-using-with
         self.health_executor = futures.ProcessPoolExecutor(
             max_workers=CONF.health_manager.health_update_threads)
-        # pylint: disable=consider-using-with
         self.stats_executor = futures.ProcessPoolExecutor(
             max_workers=CONF.health_manager.stats_update_threads)
         self.health_updater = UpdateHealthDb()
diff --git a/octavia/common/base_taskflow.py b/octavia/common/base_taskflow.py
index 29a5062215..3b4e76ecb5 100644
--- a/octavia/common/base_taskflow.py
+++ b/octavia/common/base_taskflow.py
@@ -57,7 +57,6 @@ class BaseTaskFlowEngine(object):
     def __init__(self):
         # work around for https://bugs.python.org/issue7980
         datetime.datetime.strptime('2014-06-19 22:47:16', '%Y-%m-%d %H:%M:%S')
-        # pylint: disable=consider-using-with
         self.executor = concurrent.futures.ThreadPoolExecutor(
             max_workers=CONF.task_flow.max_workers)
 
diff --git a/octavia/controller/healthmanager/health_manager.py b/octavia/controller/healthmanager/health_manager.py
index 2a9a95df20..9b440311b9 100644
--- a/octavia/controller/healthmanager/health_manager.py
+++ b/octavia/controller/healthmanager/health_manager.py
@@ -63,7 +63,6 @@ class HealthManager(object):
         else:
             self.cw = cw2.ControllerWorker()
         self.threads = CONF.health_manager.failover_threads
-        # pylint: disable=consider-using-with
         self.executor = futures.ThreadPoolExecutor(max_workers=self.threads)
         self.amp_repo = repo.AmphoraRepository()
         self.amp_health_repo = repo.AmphoraHealthRepository()
diff --git a/tox.ini b/tox.ini
index c2caa9cfdf..a7e5afc10a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -94,7 +94,6 @@ allowlist_externals =
 deps =
     -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/requirements.txt
-    -r{toxinidir}/test-requirements.txt
     -r{toxinidir}/doc/requirements.txt
 allowlist_externals = rm
 commands =