Make tests pass for 1.9.3-p125