diff --git a/neutron_fwaas/tests/unit/services/logapi/agents/l3/test_fwg_log.py b/neutron_fwaas/tests/unit/services/logapi/agents/l3/test_fwg_log.py
index 45125c0ac..6a110d939 100644
--- a/neutron_fwaas/tests/unit/services/logapi/agents/l3/test_fwg_log.py
+++ b/neutron_fwaas/tests/unit/services/logapi/agents/l3/test_fwg_log.py
@@ -34,7 +34,7 @@ class FWaaSL3LoggingExtensionInitializeTestCase(base.L3LoggingExtBaseTestCase):
     @mock.patch.object(registry, 'register')
     @mock.patch.object(resources_rpc, 'ResourcesPushRpcCallback')
     def test_initialize_subscribed_to_rpc(self, rpc_mock, subscribe_mock):
-        call_to_patch = 'neutron.common.rpc.Connection'
+        call_to_patch = 'neutron_lib.rpc.Connection'
         with mock.patch(call_to_patch,
                         return_value=self.connection) as create_connection:
             self.fw_l3_log_ext.initialize(
diff --git a/tox.ini b/tox.ini
index beeea2e03..6e16f7a3b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,11 +13,9 @@ deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/re
 whitelist_externals =
   sh
   find
-  rm
 commands =
   find . -type f -name "*.py[c|o]" -delete
-  find . -type d -name "__pycache__" -delete
-  rm -rf .tox/lower-constraints/*
+  find . -path "*/__pycache__*" -delete
   {toxinidir}/tools/ostestr_compat_shim.sh {posargs}
 # there is also secret magic in ostestr which lets you run in a fail only
 # mode. To do this define the TRACE_FAILONLY environmental variable.