Fix run suite
when suite name matches directory
#6105
+115
−5
Merged