Make test_storage pass under 1.8.7