Fix breakage of 'make test'