diff --git a/neutron_fwaas/extensions/firewall.py b/neutron_fwaas/extensions/firewall.py
index 43a9876c1..8b7b4ff62 100644
--- a/neutron_fwaas/extensions/firewall.py
+++ b/neutron_fwaas/extensions/firewall.py
@@ -401,8 +401,7 @@ class Firewall(extensions.ExtensionDescriptor):
         return resource_helper.build_resource_info(plural_mappings,
                                                    RESOURCE_ATTRIBUTE_MAP,
                                                    p_const.FIREWALL,
-                                                   action_map=action_map,
-                                                   register_quota=True)
+                                                   action_map=action_map)
 
     @classmethod
     def get_plugin_interface(cls):
diff --git a/neutron_fwaas/tests/unit/db/firewall/test_firewall_db.py b/neutron_fwaas/tests/unit/db/firewall/test_firewall_db.py
index 1d0ce4814..4671eb960 100644
--- a/neutron_fwaas/tests/unit/db/firewall/test_firewall_db.py
+++ b/neutron_fwaas/tests/unit/db/firewall/test_firewall_db.py
@@ -54,9 +54,6 @@ AUDITED = True
 ENABLED = True
 ADMIN_STATE_UP = True
 
-QUOTA_FW = 3
-QUOTA_FW_POLICY = 5
-
 
 class FakeAgentApi(fwaas_plugin.FirewallCallbacks):
     """
@@ -82,10 +79,6 @@ class FirewallPluginDbTestCase(base.NeutronDbPluginV2TestCase):
     )
 
     def setUp(self, core_plugin=None, fw_plugin=None, ext_mgr=None):
-        # increase quota
-        cfg.CONF.set_override('quota_firewall', 3, group='QUOTAS')
-        cfg.CONF.set_override('quota_firewall_policy', 5, group='QUOTAS')
-
         self.agentapi_delf_p = mock.patch(DELETEFW_PATH, create=True,
                                           new=FakeAgentApi().delete_firewall)
         self.agentapi_delf_p.start()
@@ -1484,34 +1477,3 @@ class TestFirewallDBPlugin(FirewallPluginDbTestCase):
         with self.firewall(name='fireWall1') as fw:
             res = self._show('firewalls', fw['firewall']['id'])
             self.assertEqual('fireWall1', res['firewall']['name'])
-
-    def test_quota_fw(self):
-        # no more than three firewalls
-        for i in range(-1, QUOTA_FW):
-            res = self._create_firewall(self.fmt, str(i), 'blah',
-                                        None, router_ids=[])
-        self.assertEqual(409, res.status_code)
-        self.assertEqual('OverQuota', res.json_body['NeutronError']['type'])
-
-    def test_quota_fw_policy(self):
-        # no more than five policies
-        for i in range(-1, QUOTA_FW_POLICY):
-            res = self.res = self._create_firewall_policy(
-                None, 'fwp',
-                description="firewall_policy",
-                shared=True,
-                firewall_rules=[],
-                audited=True)
-        self.assertEqual(409, res.status_code)
-        self.assertEqual('OverQuota', res.json_body['NeutronError']['type'])
-
-    def test_quota_fw_rule(self):
-        for i in range(0, 101):
-            res = self._create_firewall_rule(self.fmt, str(i),
-                                             SHARED, PROTOCOL,
-                                             IP_VERSION, SOURCE_IP_ADDRESS_RAW,
-                                             DESTINATION_IP_ADDRESS_RAW,
-                                             SOURCE_PORT, DESTINATION_PORT,
-                                             ACTION, ENABLED)
-        self.assertEqual(409, res.status_code)
-        self.assertEqual('OverQuota', res.json_body['NeutronError']['type'])
diff --git a/neutron_fwaas/tests/unit/services/firewall/test_fwaas_plugin.py b/neutron_fwaas/tests/unit/services/firewall/test_fwaas_plugin.py
index 90f63f87d..e6635703e 100644
--- a/neutron_fwaas/tests/unit/services/firewall/test_fwaas_plugin.py
+++ b/neutron_fwaas/tests/unit/services/firewall/test_fwaas_plugin.py
@@ -58,10 +58,6 @@ class TestFirewallRouterInsertionBase(
         test_db_firewall.FirewallPluginDbTestCase):
 
     def setUp(self, core_plugin=None, fw_plugin=None, ext_mgr=None):
-        # increase quota
-        cfg.CONF.set_override('quota_firewall', 3, group='QUOTAS')
-        cfg.CONF.set_override('quota_firewall_policy', 5, group='QUOTAS')
-
         self.agentapi_del_fw_p = mock.patch(test_db_firewall.DELETEFW_PATH,
             create=True, new=test_db_firewall.FakeAgentApi().delete_firewall)
         self.agentapi_del_fw_p.start()