Revert "Bug 1060218 - [System] Minor marionette test cleanup r=kgrandon"

This reverts commit cb6f1877572b5aae386cf95fa159f98f715acf0d.