diff --git a/tests/test_posttest.py b/tests/test_posttest.py
index 705733e5f5d..527c2df10df 100644
--- a/tests/test_posttest.py
+++ b/tests/test_posttest.py
@@ -15,7 +15,8 @@
 ]
 
 
-def test_collect_techsupport(duthost):
+def test_collect_techsupport(duthosts, dut_hostname):
+    duthost = duthosts[dut_hostname]
     """
     A util for collecting techsupport after tests.
 
@@ -34,7 +35,8 @@ def test_collect_techsupport(duthost):
 
     assert True
 
-def test_restore_container_autorestart(duthost):
+def test_restore_container_autorestart(duthosts, dut_hostname):
+    duthost = duthosts[dut_hostname]
     state_file_name = "/tmp/autorestart_state_{}.json".format(duthost.hostname)
     if not os.path.exists(state_file_name):
         return
@@ -59,7 +61,8 @@ def test_restore_container_autorestart(duthost):
     SNMP_RELOADING_TIME = 30
     time.sleep(SNMP_RELOADING_TIME)
 
-def test_recover_rsyslog_rate_limit(duthost):
+def test_recover_rsyslog_rate_limit(duthosts, dut_hostname):
+    duthost = duthosts[dut_hostname]
     features_dict, succeed = duthost.get_feature_status()
     if not succeed:
         # Something unexpected happened.
diff --git a/tests/test_pretest.py b/tests/test_pretest.py
index a494b0b5af9..5cf5c9b9672 100644
--- a/tests/test_pretest.py
+++ b/tests/test_pretest.py
@@ -14,7 +14,8 @@
     pytest.mark.disable_loganalyzer
 ]
 
-def test_cleanup_testbed(duthost, request, ptfhost):
+def test_cleanup_testbed(duthosts, dut_hostname, request, ptfhost):
+    duthost = duthosts[dut_hostname]
     deep_clean = request.config.getoption("--deep_clean")
     if deep_clean:
         logger.info("Deep cleaning DUT {}".format(duthost.hostname))
@@ -29,7 +30,8 @@ def test_cleanup_testbed(duthost, request, ptfhost):
     if ptfhost:
         ptfhost.shell("if [[ -f /etc/rsyslog.conf ]]; then mv /etc/rsyslog.conf /etc/rsyslog.conf.orig; uniq /etc/rsyslog.conf.orig > /etc/rsyslog.conf; fi", executable="/bin/bash")
 
-def test_disable_container_autorestart(duthost):
+def test_disable_container_autorestart(duthosts, dut_hostname):
+    duthost = duthosts[dut_hostname]
     command_output = duthost.shell("show feature autorestart", module_ignore_errors=True)
     if command_output['rc'] != 0:
         logging.info("Feature autorestart utility not supported. Error: {}".format(command_output['stderr']))
@@ -81,7 +83,8 @@ def test_update_testbed_metadata(duthosts, tbinfo):
         logger.warning('Unable to create file {}: {}'.format(filepath, e))
 
 
-def test_disable_rsyslog_rate_limit(duthost):
+def test_disable_rsyslog_rate_limit(duthosts, dut_hostname):
+    duthost = duthosts[dut_hostname]
     features_dict, succeed = duthost.get_feature_status()
     if not succeed:
         # Something unexpected happened.