diff --git a/neutron/tests/base.py b/neutron/tests/base.py
index 3dbd86a6684..e4a4e397838 100644
--- a/neutron/tests/base.py
+++ b/neutron/tests/base.py
@@ -55,7 +55,6 @@ from neutron import manager
 from neutron import policy
 from neutron.quota import resource_registry
 from neutron.tests import post_mortem_debug
-from neutron.tests import tools
 
 
 CONF = cfg.CONF
@@ -230,7 +229,7 @@ class DietTestCase(base.BaseTestCase):
                 debugger))
 
         # Make sure we see all relevant deprecation warnings when running tests
-        self.useFixture(tools.WarningsFixture())
+            self.useFixture(fixture.WarningsFixture(module_re=['^neutron\\.']))
 
         self.useFixture(fixture.DBQueryHooksFixture())
 
diff --git a/neutron/tests/tools.py b/neutron/tests/tools.py
index c5e7ed22401..d323368fea8 100644
--- a/neutron/tests/tools.py
+++ b/neutron/tests/tools.py
@@ -15,7 +15,6 @@
 
 import datetime
 import random
-import warnings
 
 import fixtures
 import netaddr
@@ -39,20 +38,6 @@ except ImportError as e:
     _CALLBACK_PRIORITY_SUPPORTED = False
 
 
-class WarningsFixture(fixtures.Fixture):
-    """Filters out warnings during test runs."""
-
-    warning_types = (
-        DeprecationWarning, PendingDeprecationWarning, ImportWarning
-    )
-
-    def _setUp(self):
-        self.addCleanup(warnings.resetwarnings)
-        for wtype in self.warning_types:
-            warnings.filterwarnings(
-                "once", category=wtype, module='^neutron\\.')
-
-
 class SafeCleanupFixture(fixtures.Fixture):
     """Catch errors in daughter fixture cleanup."""