Test rewrite for avoid test skip. Related #5592