our test writer needs to do a bit more now
merge bug25360 into stable
merge stable into default