Fix tst-rfc3484 build failures