Fix failing test on travis stemming from b36780e708