Hopefully fix the Cirrus tests
Hopefully fix the Cirrus tests

The Cirrus tests just began failing.  I'm guessing that Cirrus's
software was upgraded and now complains about a hitherto unnoticed error
in our config.

asomers/mockall,asomers/mockall