Merge pull request #7574 from DrewScoggins/runtestfix