fix-test-suite-for-5.2
