Bug 1053774: fix test failures. rs=bustage,Standard8