Fix porting tests to mollify Jenkins

(Didn't realize he was even paying attention to this branch!)