diff --git a/tests/everflow/conftest.py b/tests/everflow/conftest.py
index 9195a3cde6c..2201de44e65 100644
--- a/tests/everflow/conftest.py
+++ b/tests/everflow/conftest.py
@@ -5,22 +5,22 @@
 @pytest.fixture(autouse=True, scope="package")
 def setup_recycle_port(duthosts, tbinfo):
     """Setup recycle port ip address on t2 topo"""
-    if "t2" in tbinfo['topo']['name']:
-        for duthost in duthosts.frontend_nodes:
-            for asic in duthost.asics:
-                cmd = "sudo config interface -n {ns} ip add Ethernet-Rec{rec} 1.1.1.{an}/32".format(ns=asic.namespace,
-                                                                                                    rec=asic.asic_index,
-                                                                                                    an=asic.asic_index+1)
-                logging.info(cmd)
-                duthost.command(cmd)
-            duthost.command("sudo config save -y")
+    if "t2" not in tbinfo['topo']['name']:
+        return
+    for duthost in duthosts.frontend_nodes:
+        for asic in duthost.asics:
+            cmd = "sudo config interface -n {ns} ip add Ethernet-Rec{rec} 1.1.1.{an}/32".format(ns=asic.namespace,
+                                                                                                rec=asic.asic_index,
+                                                                                                an=asic.asic_index+1)
+            logging.info(cmd)
+            duthost.command(cmd)
+        duthost.command("sudo config save -y")
     yield
-    if "t2" in tbinfo['topo']['name']:
-        for duthost in duthosts.frontend_nodes:
-            for asic in duthost.asics:
-                cmd = "sudo config interface -n {ns} ip remove Ethernet-Rec{rec} 1.1.1.{an}/32".format(ns=asic.namespace,
-                                                                                                    rec=asic.asic_index,
-                                                                                                    an=asic.asic_index+1)
-                logging.info(cmd)
-                duthost.command(cmd)
-            duthost.command("sudo config save -y")
+    for duthost in duthosts.frontend_nodes:
+        for asic in duthost.asics:
+            cmd = "sudo config interface -n {ns} ip remove Ethernet-Rec{rec} 1.1.1.{an}/32".format(ns=asic.namespace,
+                                                                                                   rec=asic.asic_index,
+                                                                                                   an=asic.asic_index+1)
+            logging.info(cmd)
+            duthost.command(cmd)
+        duthost.command("sudo config save -y")