Make tests and dependencies 5.3-compatible