diff --git a/tempest/api/network/admin/test_l3_agent_scheduler.py b/tempest/api/network/admin/test_l3_agent_scheduler.py
index e1970b9..42a8f34 100644
--- a/tempest/api/network/admin/test_l3_agent_scheduler.py
+++ b/tempest/api/network/admin/test_l3_agent_scheduler.py
@@ -68,6 +68,8 @@
             raise exceptions.InvalidConfiguration(msg)
         cls.router = cls.create_router()
 
+        # TODO(ylobankov): Delete this 'if' block once 'dvr_extra_resources'
+        # option is deleted. Currently this option is deprecated for removal.
         if CONF.network.dvr_extra_resources:
             # NOTE(armax): If DVR is an available extension, and the created
             # router is indeed a distributed one, more resources need to be
@@ -97,6 +99,8 @@
                         cls.router['id'],
                         external_gateway_info=external_gateway_info)
 
+    # TODO(ylobankov): Delete this cleanup block once 'dvr_extra_resources'
+    # option is deleted. Currently this option is deprecated for removal.
     @classmethod
     def resource_cleanup(cls):
         if cls.is_dvr_router:
diff --git a/tempest/config.py b/tempest/config.py
index 35eb187..24651f1 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -613,9 +613,8 @@
                 default=False,
                 help="The environment does not support network separation "
                      "between tenants."),
-    # TODO(ylobankov): Delete this option once the Liberty release is EOL.
     cfg.BoolOpt('dvr_extra_resources',
-                default=True,
+                default=False,
                 help="Whether or not to create internal network, subnet, "
                      "port and add network interface to distributed router "
                      "in L3 agent scheduler test. Extra resources need to be "