diff --git a/tests/test_mirror.py b/tests/test_mirror.py
index 56869871dec..d52f1fd86aa 100644
--- a/tests/test_mirror.py
+++ b/tests/test_mirror.py
@@ -132,7 +132,7 @@ def test_MirrorAddRemove(self, dvs, testlog):
         # add route to mirror destination via 10.0.0.1
         self.add_route(dvs, "2.2.2.2", "10.0.0.1")
         assert self.get_mirror_session_state(session)["status"] == "active"
-        assert self.get_mirror_session_state(session)["monitor_port"] == dvs.asicdb.portnamemap["Ethernet16"]
+        assert self.get_mirror_session_state(session)["monitor_port"] == "Ethernet16"
         assert self.get_mirror_session_state(session)["dst_mac"] == "02:04:06:08:10:12"
         assert self.get_mirror_session_state(session)["route_prefix"] == "2.2.2.2/32"
 
@@ -813,8 +813,3 @@ def test_AclBindMirror(self, dvs, testlog):
         self._test_AclBindMirror(dvs, testlog, create_seq_test=True)
 
 
-# Add Dummy always-pass test at end as workaroud
-# for issue when Flaky fail on final test it invokes module tear-down before retrying
-def test_nonflaky_dummy():
-    pass
-