one test writer is quite enough. and make it work.
merge bug25360 into stable
merge stable into default