diff --git a/tests/everflow/everflow_test_utilities.py b/tests/everflow/everflow_test_utilities.py
index fe1aebe278f..754d8349328 100644
--- a/tests/everflow/everflow_test_utilities.py
+++ b/tests/everflow/everflow_test_utilities.py
@@ -354,11 +354,11 @@ def setup_info(duthosts, rand_one_dut_hostname, tbinfo, request, topo_scenario):
     """
     duthost = None
     topo = tbinfo['topo']['name']
-    if 't1' in topo or 't0' in topo or 'm0' in topo or 'mx' in topo or 'dualtor' in topo:
-        downstream_duthost = upstream_duthost = duthost = duthosts[rand_one_dut_hostname]
-    elif 't2' in topo:
+    if 't2' in topo:
         pytest_assert(len(duthosts) > 1, "Test must run on whole chassis")
         downstream_duthost, upstream_duthost = get_t2_duthost(duthosts, tbinfo)
+    else:
+        downstream_duthost = upstream_duthost = duthost = duthosts[rand_one_dut_hostname]
 
     setup_information = gen_setup_information(duthost, downstream_duthost, upstream_duthost, tbinfo, topo_scenario)
 
diff --git a/tests/everflow/test_everflow_per_interface.py b/tests/everflow/test_everflow_per_interface.py
index 555eca846af..d88b45e5160 100644
--- a/tests/everflow/test_everflow_per_interface.py
+++ b/tests/everflow/test_everflow_per_interface.py
@@ -44,6 +44,8 @@ def build_candidate_ports(duthost, tbinfo, ns):
         candidate_neigh_name = 'MX'
     elif tbinfo['topo']['type'] == 't1':
         candidate_neigh_name = 'T0'
+    elif tbinfo['topo']['type'] == 'm1':
+        candidate_neigh_name = 'M0'
     else:
         candidate_neigh_name = 'T1'
     mg_facts = duthost.get_extended_minigraph_facts(tbinfo)