Fix test cleanup code under 0.11.14