Fix bug in tests that only show up in 2.10.