I replaced fiveam by lisp-unit2 in 'native-inputs' for the tests to
pass, and applied the patch as b5a5e4d712d0a1998995be62bb41b03955b7dcf1.
Thanks.