Backport require test addon to 1.11