Ensure that the automatic "CVS build" detection works for both