diff --git a/tests/snmp/conftest.py b/tests/snmp/conftest.py
index 45b71c83e49..3f39bc289b8 100644
--- a/tests/snmp/conftest.py
+++ b/tests/snmp/conftest.py
@@ -68,14 +68,15 @@ def setup_check_snmp_ready(duthosts, localhost):
             if 'LOCATION' not in snmp_location_redis_vals:
                 duthost.shell(f'sudo config snmp location add {yaml_snmp_location}')  # set snmp cli
 
-        yield
+    yield
 
+    for duthost in duthosts:
         # rollback configuration
         rollback(duthost, SETUP_ENV_CP)
 
-        # remove snmp files downloaded
-        local_command = "find ./snmp/ -type f -name 'snmp.yml' -exec rm -f {} +"
-        localhost.shell(local_command)
+    # remove snmp files downloaded
+    local_command = "find ./snmp/ -type f -name 'snmp.yml' -exec rm -f {} +"
+    localhost.shell(local_command)
 
 
 def extract_redis_keys(item):