Carry over behavior from 1.6.x branch re: tests