rejig for 1.8 testing