FACES-1638 tester backport to 3.0.x