fix integration tests with the latest gs 2.5.x