Fix tests again for 0.5.15 (TBR)

Review URL: https://chromiumcodereview.appspot.com//16673005