FACES-1638 tester backported for 3.0.x-legacy