Fix unit test build failures on current Debian sid and Ubuntu