Make tests pass for pre-JDK 8.