Make tests work for 5.3