fix the issue with passign tests on 2.0.x and 2.1.x