'make check' fails in 21.5