Simplify previous fix for 1.9.2 tests